Philipp Hörist pushed to branch master at gajim / gajim
Commits:
70ebcb6d by Daniel Brötzmann at 2019-06-21T07:42:24Z
Make some labels non-translatable
- - - - -
ab74eb8d by Daniel Brötzmann at 2019-06-21T07:43:49Z
Remove unused ConfirmationDialogCheck
- - - - -
3 changed files:
- gajim/data/gui/filetransfers.ui
- gajim/data/gui/service_discovery_window.ui
- gajim/gtk/dialogs.py
Changes:
=====================================
gajim/data/gui/filetransfers.ui
=====================================
@@ -155,7 +155,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Remove
completed, cancelled and failed file transfers from the list</property>
- <property name="label" translatable="yes">toolbutton</property>
<property name="icon_name">edit-clear-all-symbolic</property>
<signal name="clicked" handler="_on_cleanup_button_clicked"
swapped="no"/>
</object>
@@ -169,7 +168,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Pause or
resume file transfer</property>
- <property name="use_underline">True</property>
<property
name="icon_name">media-playback-pause-symbolic</property>
<signal name="clicked"
handler="_on_pause_resume_button_clicked" swapped="no"/>
</object>
@@ -183,7 +181,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Cancel the
selected file transfer and remove incomplete files</property>
- <property name="use_underline">True</property>
<property name="icon_name">process-stop-symbolic</property>
<signal name="clicked" handler="_on_cancel_button_clicked"
swapped="no"/>
</object>
=====================================
gajim/data/gui/service_discovery_window.ui
=====================================
@@ -75,7 +75,7 @@
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
<property name="halign">start</property>
- <property name="label" translatable="yes">Agent JID -
node</property>
+ <property name="label">Agent JID - node</property>
<property name="ellipsize">end</property>
<property name="xalign">0</property>
</object>
=====================================
gajim/gtk/dialogs.py
=====================================
@@ -330,58 +330,6 @@ class YesNoDialog(HigDialog):
return self.checkbutton.get_active()
-class ConfirmationDialogCheck(ConfirmationDialog):
- """
- HIG compliant confirmation dialog with checkbutton
- """
-
- def __init__(self, pritext, sectext='', checktext='', on_response_ok=None,
- on_response_cancel=None, is_modal=True, transient_for=None):
- self.user_response_ok = on_response_ok
- self.user_response_cancel = on_response_cancel
- if transient_for is None:
- transient_for = app.app.get_active_window()
- HigDialog.__init__(self, transient_for, Gtk.MessageType.QUESTION,
- Gtk.ButtonsType.OK_CANCEL, pritext, sectext, self.on_response_ok,
- self.on_response_cancel)
-
- self.set_default_response(Gtk.ResponseType.OK)
-
- ok_button = self.get_widget_for_response(Gtk.ResponseType.OK)
- ok_button.grab_focus()
-
- self.checkbutton = Gtk.CheckButton.new_with_mnemonic(checktext)
- self.get_content_area().pack_start(self.checkbutton, False, True, 0)
- self.set_modal(is_modal)
- self.popup()
-
- def on_response_ok(self, widget):
- if self.user_response_ok:
- if isinstance(self.user_response_ok, tuple):
- self.user_response_ok[0](self.is_checked(),
- *self.user_response_ok[1:])
- else:
- self.user_response_ok(self.is_checked())
- self.call_cancel_on_destroy = False
- self.destroy()
-
- def on_response_cancel(self, widget):
- if self.user_response_cancel:
- if isinstance(self.user_response_cancel, tuple):
- self.user_response_cancel[0](self.is_checked(),
- *self.user_response_cancel[1:])
- else:
- self.user_response_cancel(self.is_checked())
- self.call_cancel_on_destroy = False
- self.destroy()
-
- def is_checked(self):
- """
- Get active state of the checkbutton
- """
- return self.checkbutton.get_active()
-
-
class ConfirmationDialogDoubleCheck(ConfirmationDialog):
"""
HIG compliant confirmation dialog with 2 checkbuttons
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/f907ada8491a9bcde34db88c8dba12efd8095aac...ab74eb8d763dbcf5aeb03b3cc87b59adf6605bf6
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/f907ada8491a9bcde34db88c8dba12efd8095aac...ab74eb8d763dbcf5aeb03b3cc87b59adf6605bf6
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
