Ticket #228: nicotine-hig.diff

pynicotine/gtkgui/dirchooser.py

@@ -28 +28 @@
 
 
 def ChooseDir(parent = None, initialdir = "~", create=False, name=None):
-        dialog = gtk.FileChooserDialog(parent=parent, action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, buttons = (gtk.STOCK_OK, gtk.RESPONSE_ACCEPT, gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT))
+        dialog = gtk.FileChooserDialog(parent=parent, action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
         if create:
                 dialog.set_action(gtk.FILE_CHOOSER_ACTION_CREATE_FOLDER)
         else:
@@ -54 +54 @@
         return res
 
 def ChooseFile(parent = None, initialdir = "~", initialfile = ""):
-        dialog = gtk.FileChooserDialog(parent=parent, action=gtk.FILE_CHOOSER_ACTION_OPEN, buttons = (gtk.STOCK_OK, gtk.RESPONSE_ACCEPT, gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT))
+        dialog = gtk.FileChooserDialog(parent=parent, action=gtk.FILE_CHOOSER_ACTION_OPEN, buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
         dialog.set_action(gtk.FILE_CHOOSER_ACTION_OPEN)
         dialog.set_select_multiple(False)
         dir = os.path.expanduser(initialdir)
@@ -81 +81 @@
         preview.add_with_viewport(image)
         image.show()
         preview.show()
-        dialog = gtk.FileChooserDialog(parent=parent, action=gtk.FILE_CHOOSER_ACTION_OPEN, buttons = (gtk.STOCK_OK, gtk.RESPONSE_ACCEPT, gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT))
+        dialog = gtk.FileChooserDialog(parent=parent, action=gtk.FILE_CHOOSER_ACTION_OPEN, buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
         dialog.set_action(gtk.FILE_CHOOSER_ACTION_OPEN)
         dialog.set_select_multiple(False)
         dialog.set_preview_widget(preview)
@@ -121 +121 @@
 if __name__ == "__main__":
         print ChooseDir()
         print ChooseFile()
-        
- No newline at end of file
+        

pynicotine/gtkgui/chatrooms.py

@@ -312 +312 @@
                         
 def TickDialog(parent, default = ""):
         dlg = gtk.Dialog(title = _("Set ticker message"), parent = parent,
-                buttons = (gtk.STOCK_OK, gtk.RESPONSE_OK, gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
+                buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OK, gtk.RESPONSE_OK))
         dlg.set_default_response(gtk.RESPONSE_OK)
         
         t = 0

pynicotine/gtkgui/nicotine-settings.glade

@@ -4030 +4030 @@
                 <property name="response_id">0</property>
                 <signal name="clicked" handler="OnOk"/>
               </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkButton" id="ApplyButton">
@@ -4042 +4045 @@
                 <signal name="clicked" handler="OnApply"/>
               </widget>
               <packing>
-                <property name="position">1</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -4056 +4059 @@
                 <signal name="clicked" handler="OnCancel"/>
               </widget>
               <packing>
-                <property name="position">2</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </widget>

pynicotine/gtkgui/settings_glade.py

@@ -2418 +2418 @@
                 self.hbuttonbox2.set_spacing(5)
                 self.hbuttonbox2.set_layout(gtk.BUTTONBOX_END)
 
-                self.OkButton = gtk.Button(None, gtk.STOCK_OK)
-                self.OkButton.show()
-                self.OkButton.connect("clicked", self.OnOk)
-
-                self.hbuttonbox2.pack_start(self.OkButton)
-
                 self.ApplyButton = gtk.Button(None, gtk.STOCK_APPLY)
                 self.ApplyButton.show()
                 self.ApplyButton.connect("clicked", self.OnApply)
@@ -2436 +2430 @@
 
                 self.hbuttonbox2.pack_start(self.CancelButton)
 
+                self.OkButton = gtk.Button(None, gtk.STOCK_OK)
+                self.OkButton.show()
+                self.OkButton.connect("clicked", self.OnOk)
+
+                self.hbuttonbox2.pack_start(self.OkButton)
+
                 self.vbox94.pack_start(self.hbuttonbox2, False, False, 0)
 
 

pynicotine/gtkgui/entrydialog.py

@@ -481 +481 @@
                 hbox2.show()
                 box.pack_start(hbox2)   
 
+                cancel_button = self.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
                 ok_button = self.add_button(gtk.STOCK_OK, gtk.RESPONSE_OK)
                 ok_button.grab_default()
-                cancel_button = self.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
                 
         def quit(self, *args):
                 self.destroy()
@@ -544 +544 @@
                 hbox2.show()
                 box.pack_start(hbox2)   
                 
-                ok_button = self.add_button(gtk.STOCK_OK, gtk.RESPONSE_OK)
-                ok_button.grab_default()
                 if option:
                         
                         Alignment = gtk.Alignment(0.5, 0.5, 0, 0)
@@ -573 +571 @@
                         tray_button.add(Alignment)
 
                 cancel_button = self.add_button(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)
+                ok_button = self.add_button(gtk.STOCK_OK, gtk.RESPONSE_OK)
+                ok_button.grab_default()
 
         def quit(self, *args):
                 self.destroy()

pynicotine/gtkgui/utils.py

@@ -880 +880 @@
 
 def InputDialog(parent, title, message, default = ""):
         dlg = gtk.Dialog(title = title, parent = parent,
-                buttons = (gtk.STOCK_OK, gtk.RESPONSE_OK, gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
+                buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OK, gtk.RESPONSE_OK))
         dlg.set_default_response(gtk.RESPONSE_OK)
         
         dlg.set_border_width(10)