From afa0cccb29f6f7e2f6fb3a8b8ec1b803795f5681 Mon Sep 17 00:00:00 2001 From: Patrick Ulbrich Date: Sun, 19 Jun 2011 13:28:12 +0200 Subject: [PATCH] redone keyring and message dialogs in glade3 --- keyring.png | Bin 1359 -> 0 bytes keyring.py | 4 +- mailnag_keyring.glade => keyring_dialog.ui | 118 +++++++++++---------- mailnag_message.glade => message_dialog.ui | 57 +++++----- 4 files changed, 94 insertions(+), 85 deletions(-) delete mode 100644 keyring.png rename mailnag_keyring.glade => keyring_dialog.ui (56%) rename mailnag_message.glade => message_dialog.ui (65%) diff --git a/keyring.png b/keyring.png deleted file mode 100644 index 9bb9d6642ac0f9da756038aaf419ff1ec53a0fd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1359 zcmV-V1+e;wP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ign- z6gm(V(kc!B00hrTL_t(Y$Fjg27op`e@1R^wT-{n1@IWc*HAqqWNU4-}Hg zq--{OUvF>k%jeIZ|5Hy-&#wLZ_s@dH#zrSko&*US1X60m6^o0D#1TgzhCvgid){5{ zmqr#T_X#afBaWY=;5+ypB_$>D`TS^qf4}zjcJ=l3n-hsd?8J!^+t#mNKd^4yI!BHi z5qQ*GrJk2kAySM|p<;nJ$O@&+wLqj;Bq@@`fVgX3)vM8uy?v)a+qZ9@J~%k|qmGV_ z$IhHNqrSdgLqo%^O`A6TaP{id{Sdd*Vl#YSg*nR2l2RqDQpK%Prc#N>r-WvS$r+I}QTU)E4q2WMXUEMbV@I`5Hvn0)ya$U|M6XL3+ zr9Ek`Pq-IZkv_aDFeEZvOw3qiP`T)yz4yFv;o^lEcUm4rktm9UVHk~%k4I4y1xuGM z4Hhq6yfguh8o+=hE;=Xjpnl7JUD`S+(*+^}0-?a9NC}E=eZC1p*<3c4N~Qi%U0t1w z$Kw%%VVKM3^Anj&=H9`9^ywK_ zu3WKl<;p9|moIPGwr$%lgCGd^?Ac=q9Lgzp$A}&it{V0m|8&eD-FDa_tx-~_-%Wqh z>>01#9`8kb72Q+e$jFF%K0mv!udjAsU_e7d!+R@Mtk~Al((*z}ON)K`_GxNrx&>Zl z$ZMLFm?IE*&L!}$yDjpxBno0CoxKfRf^&HA{o8eHY)mql9IvmhAIfAhS8Ho)_qDdR zz5u&-@7C1RbZcckh0RmV;;-*}WwkBJRT)w+?scP@!4Z7vgV*}l*qHM2^0%t1s~@hY zsOYV!sksO{ckZ-h%a#wg@z8(8yDW3cn~n<|H|AN7-_Cv0M^al`+efHAsM$*<{9a^- zqkbk0e&AzK;(unwy{y+E#jd*HsHY9+L-qd){59;s4IL&mo0ON51K;(r>0htR;wt+E RbWi{Q002ovPDHLkV1jT|qoe=; diff --git a/keyring.py b/keyring.py index c8d98cc..af89137 100644 --- a/keyring.py +++ b/keyring.py @@ -169,7 +169,7 @@ class Keyring: self.was_locked = True builder = Gtk.Builder() builder.set_translation_domain('mailnag') - builder.add_from_file("mailnag_keyring.glade") + builder.add_from_file("keyring_dialog.ui") builder.connect_signals({"gtk_main_quit" : self.exit_keyring_dialog, \ "on_button_cancel_clicked" : self.exit_keyring_dialog, \ "on_button_ok_clicked" : self.ok_keyring_dialog, \ @@ -192,7 +192,7 @@ class Keyring: def show_message(self, message): # dialog to show keyring messages builder = Gtk.Builder() builder.set_translation_domain('mailnag') - builder.add_from_file("mailnag_message.glade") + builder.add_from_file("message_dialog.ui") builder.connect_signals({"gtk_main_quit" : self.exit_message, \ "on_button_cancel_clicked" : self.exit_message, \ "on_button_ok_clicked" : self.ok_message}) diff --git a/mailnag_keyring.glade b/keyring_dialog.ui similarity index 56% rename from mailnag_keyring.glade rename to keyring_dialog.ui index 68a65b7..de6c6c8 100644 --- a/mailnag_keyring.glade +++ b/keyring_dialog.ui @@ -1,103 +1,105 @@ - - + + False 5 Mailnag + False True center - 250 - 150 True - mailnag.svg dialog True - - True + + False + vertical 2 - - - True - - - True - keyring.png - - - 0 - - - - - True - Keyring is locked, -please enter password: - - - 1 - - - - - 1 - - - - - True - True - False - • - True - - - - 2 - - - - True - center + + False + end - Cancel + gtk-cancel True True True - + False + True + False - False + True 0 - Ok + gtk-ok True True - True - True True - + False + True + False - False + True 1 False + True end 0 + + + True + False + vertical + 6 + + + True + False + Mailnag can't access the keyring because it is locked. +Please enter the password: + + + False + True + 0 + + + + + True + True + False + • + + + + False + True + 1 + + + + + False + True + 1 + + diff --git a/mailnag_message.glade b/message_dialog.ui similarity index 65% rename from mailnag_message.glade rename to message_dialog.ui index 877ea33..88c5fa8 100644 --- a/mailnag_message.glade +++ b/message_dialog.ui @@ -1,67 +1,74 @@ - - + + False 5 Mailnag Message False center - normal + dialog - - True + + False + vertical 2 - - - True - label - - - 1 - - - - True - center + + False + end - Cancel + gtk-cancel True True True - + False + True + False - False + True 0 - Ok + gtk-ok True True - True - True True - + False + True + False - False + True 1 False + True end 0 + + + True + False + label + + + False + True + 1 + +