Philipp Hörist pushed to branch master at gajim / gajim

Commits:

2 changed files:

Changes:

  • gajim/data/gui/groupchat_control.ui
    ... ... @@ -137,8 +137,8 @@
    137 137
                 <child>
    
    138 138
                   <object class="GtkBox" id="groupchat_control_vbox">
    
    139 139
                     <property name="can_focus">True</property>
    
    140
    -                <property name="margin_left">7</property>
    
    141
    -                <property name="margin_right">7</property>
    
    140
    +                <property name="margin_start">7</property>
    
    141
    +                <property name="margin_end">7</property>
    
    142 142
                     <property name="margin_top">5</property>
    
    143 143
                     <property name="margin_bottom">7</property>
    
    144 144
                     <property name="spacing">3</property>
    
    ... ... @@ -147,7 +147,7 @@
    147 147
                         <property name="width_request">0</property>
    
    148 148
                         <property name="visible">True</property>
    
    149 149
                         <property name="can_focus">False</property>
    
    150
    -                    <property name="margin_right">4</property>
    
    150
    +                    <property name="margin_end">4</property>
    
    151 151
                         <property name="hexpand">True</property>
    
    152 152
                         <property name="orientation">vertical</property>
    
    153 153
                         <child>
    
    ... ... @@ -1049,7 +1049,7 @@
    1049 1049
                             <property name="spacing">6</property>
    
    1050 1050
                             <child>
    
    1051 1051
                               <object class="GtkButton" id="remove_bookmark_button">
    
    1052
    -                            <property name="label" translatable="yes">_Leave Group Chat</property>
    
    1052
    +                            <property name="label" translatable="yes">_Forget Group Chat</property>
    
    1053 1053
                                 <property name="visible">True</property>
    
    1054 1054
                                 <property name="can_focus">True</property>
    
    1055 1055
                                 <property name="receives_default">True</property>
    
    ... ... @@ -1068,6 +1068,21 @@
    1068 1068
                                 <property name="position">0</property>
    
    1069 1069
                               </packing>
    
    1070 1070
                             </child>
    
    1071
    +                        <child>
    
    1072
    +                          <object class="GtkButton" id="retry_button">
    
    1073
    +                            <property name="label" translatable="yes">_Retry</property>
    
    1074
    +                            <property name="visible">True</property>
    
    1075
    +                            <property name="can_focus">True</property>
    
    1076
    +                            <property name="receives_default">True</property>
    
    1077
    +                            <property name="use_underline">True</property>
    
    1078
    +                            <signal name="clicked" handler="_on_retry_join_clicked" swapped="no"/>
    
    1079
    +                          </object>
    
    1080
    +                          <packing>
    
    1081
    +                            <property name="expand">False</property>
    
    1082
    +                            <property name="fill">True</property>
    
    1083
    +                            <property name="position">1</property>
    
    1084
    +                          </packing>
    
    1085
    +                        </child>
    
    1071 1086
                             <child>
    
    1072 1087
                               <object class="GtkButton" id="close_button">
    
    1073 1088
                                 <property name="label" translatable="yes">_Close</property>
    
    ... ... @@ -1083,7 +1098,7 @@
    1083 1098
                               <packing>
    
    1084 1099
                                 <property name="expand">False</property>
    
    1085 1100
                                 <property name="fill">True</property>
    
    1086
    -                            <property name="position">1</property>
    
    1101
    +                            <property name="position">2</property>
    
    1087 1102
                               </packing>
    
    1088 1103
                             </child>
    
    1089 1104
                           </object>
    

  • gajim/groupchat_control.py
    ... ... @@ -2150,6 +2150,10 @@ class GroupchatControl(ChatControlBase):
    2150 2150
             con.get_module('Bookmarks').remove(self.room_jid)
    
    2151 2151
             self._close_control()
    
    2152 2152
     
    
    2153
    +    def _on_retry_join_clicked(self, _button=None):
    
    2154
    +        app.connections[self.account].get_module('MUC').join(self._muc_data)
    
    2155
    +        self._show_page('progress')
    
    2156
    +
    
    2153 2157
         def _on_page_cancel_clicked(self, _button=None):
    
    2154 2158
             self._show_page('groupchat')
    
    2155 2159