Daniel Brötzmann pushed to branch mainwindow at gajim / gajim

Commits:

4 changed files:

Changes:

  • gajim/data/gui/main.ui
    ... ... @@ -8,200 +8,6 @@
    8 8 
         <property name="can-focus">False</property>
    9 9 
         <property name="hexpand">True</property>
    10 10 
         <property name="vexpand">True</property>
    11 
    -    <child>
    12 
    -      <!-- n-columns=3 n-rows=3 -->
    13 
    -      <object class="GtkGrid" id="right_grid">
    14 
    -        <property name="visible">True</property>
    15 
    -        <property name="can-focus">False</property>
    16 
    -        <property name="hexpand">True</property>
    17 
    -        <property name="vexpand">True</property>
    18 
    -        <child>
    19 
    -          <placeholder/>
    20 
    -        </child>
    21 
    -        <child>
    22 
    -          <placeholder/>
    23 
    -        </child>
    24 
    -        <child>
    25 
    -          <placeholder/>
    26 
    -        </child>
    27 
    -        <child>
    28 
    -          <placeholder/>
    29 
    -        </child>
    30 
    -        <child>
    31 
    -          <placeholder/>
    32 
    -        </child>
    33 
    -        <child>
    34 
    -          <placeholder/>
    35 
    -        </child>
    36 
    -        <child>
    37 
    -          <placeholder/>
    38 
    -        </child>
    39 
    -        <child>
    40 
    -          <placeholder/>
    41 
    -        </child>
    42 
    -        <child>
    43 
    -          <placeholder/>
    44 
    -        </child>
    45 
    -      </object>
    46 
    -      <packing>
    47 
    -        <property name="left-attach">2</property>
    48 
    -        <property name="top-attach">0</property>
    49 
    -      </packing>
    50 
    -    </child>
    51 
    -    <child>
    52 
    -      <!-- n-columns=3 n-rows=3 -->
    53 
    -      <object class="GtkGrid" id="middle_grid">
    54 
    -        <property name="visible">True</property>
    55 
    -        <property name="can-focus">False</property>
    56 
    -        <property name="vexpand">True</property>
    57 
    -        <property name="orientation">vertical</property>
    58 
    -        <child>
    59 
    -          <!-- n-columns=1 n-rows=2 -->
    60 
    -          <object class="GtkGrid">
    61 
    -            <property name="visible">True</property>
    62 
    -            <property name="can-focus">False</property>
    63 
    -            <property name="row-spacing">6</property>
    64 
    -            <child>
    65 
    -              <object class="GtkBox">
    66 
    -                <property name="visible">True</property>
    67 
    -                <property name="can-focus">False</property>
    68 
    -                <property name="spacing">12</property>
    69 
    -                <child>
    70 
    -                  <object class="GtkButton" id="start_chat_button">
    71 
    -                    <property name="visible">True</property>
    72 
    -                    <property name="can-focus">True</property>
    73 
    -                    <property name="receives-default">True</property>
    74 
    -                    <property name="tooltip-text" translatable="yes">Start Chat</property>
    75 
    -                    <child>
    76 
    -                      <object class="GtkImage">
    77 
    -                        <property name="visible">True</property>
    78 
    -                        <property name="can-focus">False</property>
    79 
    -                        <property name="icon-name">list-add-symbolic</property>
    80 
    -                      </object>
    81 
    -                    </child>
    82 
    -                    <style>
    83 
    -                      <class name="suggested-action"/>
    84 
    -                    </style>
    85 
    -                  </object>
    86 
    -                  <packing>
    87 
    -                    <property name="expand">False</property>
    88 
    -                    <property name="fill">True</property>
    89 
    -                    <property name="position">0</property>
    90 
    -                  </packing>
    91 
    -                </child>
    92 
    -                <child>
    93 
    -                  <object class="GtkSearchEntry" id="search_entry">
    94 
    -                    <property name="width-request">200</property>
    95 
    -                    <property name="visible">True</property>
    96 
    -                    <property name="can-focus">True</property>
    97 
    -                    <property name="primary-icon-name">edit-find-symbolic</property>
    98 
    -                    <property name="primary-icon-activatable">False</property>
    99 
    -                    <property name="primary-icon-sensitive">False</property>
    100 
    -                    <property name="placeholder-text" translatable="yes">Search…</property>
    101 
    -                  </object>
    102 
    -                  <packing>
    103 
    -                    <property name="expand">False</property>
    104 
    -                    <property name="fill">True</property>
    105 
    -                    <property name="position">1</property>
    106 
    -                  </packing>
    107 
    -                </child>
    108 
    -              </object>
    109 
    -              <packing>
    110 
    -                <property name="left-attach">0</property>
    111 
    -                <property name="top-attach">1</property>
    112 
    -              </packing>
    113 
    -            </child>
    114 
    -            <child>
    115 
    -              <object class="GtkBox">
    116 
    -                <property name="visible">True</property>
    117 
    -                <property name="can-focus">False</property>
    118 
    -                <property name="spacing">12</property>
    119 
    -                <child>
    120 
    -                  <object class="GtkLabel" id="workspace_label">
    121 
    -                    <property name="visible">True</property>
    122 
    -                    <property name="can-focus">False</property>
    123 
    -                    <property name="label">Workspace Label</property>
    124 
    -                    <property name="ellipsize">end</property>
    125 
    -                    <style>
    126 
    -                      <class name="large-header"/>
    127 
    -                    </style>
    128 
    -                  </object>
    129 
    -                  <packing>
    130 
    -                    <property name="expand">False</property>
    131 
    -                    <property name="fill">True</property>
    132 
    -                    <property name="position">0</property>
    133 
    -                  </packing>
    134 
    -                </child>
    135 
    -                <child>
    136 
    -                  <object class="GtkButton" id="edit_workspace_button">
    137 
    -                    <property name="visible">True</property>
    138 
    -                    <property name="can-focus">True</property>
    139 
    -                    <property name="receives-default">True</property>
    140 
    -                    <property name="tooltip-text" translatable="yes">Edit Workspace</property>
    141 
    -                    <property name="relief">none</property>
    142 
    -                    <child>
    143 
    -                      <object class="GtkImage">
    144 
    -                        <property name="visible">True</property>
    145 
    -                        <property name="can-focus">False</property>
    146 
    -                        <property name="icon-name">document-edit-symbolic</property>
    147 
    -                      </object>
    148 
    -                    </child>
    149 
    -                    <style>
    150 
    -                      <class name="flat"/>
    151 
    -                    </style>
    152 
    -                  </object>
    153 
    -                  <packing>
    154 
    -                    <property name="expand">False</property>
    155 
    -                    <property name="fill">True</property>
    156 
    -                    <property name="pack-type">end</property>
    157 
    -                    <property name="position">1</property>
    158 
    -                  </packing>
    159 
    -                </child>
    160 
    -              </object>
    161 
    -              <packing>
    162 
    -                <property name="left-attach">0</property>
    163 
    -                <property name="top-attach">0</property>
    164 
    -              </packing>
    165 
    -            </child>
    166 
    -            <style>
    167 
    -              <class name="chatlist-top-bar"/>
    168 
    -            </style>
    169 
    -          </object>
    170 
    -          <packing>
    171 
    -            <property name="left-attach">0</property>
    172 
    -            <property name="top-attach">0</property>
    173 
    -          </packing>
    174 
    -        </child>
    175 
    -        <child>
    176 
    -          <placeholder/>
    177 
    -        </child>
    178 
    -        <child>
    179 
    -          <placeholder/>
    180 
    -        </child>
    181 
    -        <child>
    182 
    -          <placeholder/>
    183 
    -        </child>
    184 
    -        <child>
    185 
    -          <placeholder/>
    186 
    -        </child>
    187 
    -        <child>
    188 
    -          <placeholder/>
    189 
    -        </child>
    190 
    -        <child>
    191 
    -          <placeholder/>
    192 
    -        </child>
    193 
    -        <child>
    194 
    -          <placeholder/>
    195 
    -        </child>
    196 
    -        <child>
    197 
    -          <placeholder/>
    198 
    -        </child>
    199 
    -      </object>
    200 
    -      <packing>
    201 
    -        <property name="left-attach">1</property>
    202 
    -        <property name="top-attach">0</property>
    203 
    -      </packing>
    204 
    -    </child>
    205 11 
         <child>
    206 12 
           <!-- n-columns=3 n-rows=3 -->
    207 13 
           <object class="GtkGrid" id="left_grid">
    ... ... @@ -324,6 +130,215 @@
    324 130 
             <property name="top-attach">0</property>
    325 131 
           </packing>
    326 132 
         </child>
    133 
    +    <child>
    134 
    +      <object class="GtkPaned" id="paned">
    135 
    +        <property name="visible">True</property>
    136 
    +        <property name="can-focus">True</property>
    137 
    +        <property name="position">250</property>
    138 
    +        <property name="position-set">True</property>
    139 
    +        <child>
    140 
    +          <!-- n-columns=3 n-rows=3 -->
    141 
    +          <object class="GtkGrid" id="middle_grid">
    142 
    +            <property name="visible">True</property>
    143 
    +            <property name="can-focus">False</property>
    144 
    +            <property name="vexpand">True</property>
    145 
    +            <property name="orientation">vertical</property>
    146 
    +            <child>
    147 
    +              <!-- n-columns=1 n-rows=2 -->
    148 
    +              <object class="GtkGrid">
    149 
    +                <property name="visible">True</property>
    150 
    +                <property name="can-focus">False</property>
    151 
    +                <property name="row-spacing">3</property>
    152 
    +                <child>
    153 
    +                  <object class="GtkBox">
    154 
    +                    <property name="visible">True</property>
    155 
    +                    <property name="can-focus">False</property>
    156 
    +                    <property name="spacing">12</property>
    157 
    +                    <child>
    158 
    +                      <object class="GtkButton" id="start_chat_button">
    159 
    +                        <property name="visible">True</property>
    160 
    +                        <property name="can-focus">True</property>
    161 
    +                        <property name="receives-default">True</property>
    162 
    +                        <property name="tooltip-text" translatable="yes">Start Chat</property>
    163 
    +                        <child>
    164 
    +                          <object class="GtkImage">
    165 
    +                            <property name="visible">True</property>
    166 
    +                            <property name="can-focus">False</property>
    167 
    +                            <property name="icon-name">list-add-symbolic</property>
    168 
    +                          </object>
    169 
    +                        </child>
    170 
    +                        <style>
    171 
    +                          <class name="suggested-action"/>
    172 
    +                        </style>
    173 
    +                      </object>
    174 
    +                      <packing>
    175 
    +                        <property name="expand">False</property>
    176 
    +                        <property name="fill">True</property>
    177 
    +                        <property name="position">0</property>
    178 
    +                      </packing>
    179 
    +                    </child>
    180 
    +                    <child>
    181 
    +                      <object class="GtkSearchEntry" id="search_entry">
    182 
    +                        <property name="visible">True</property>
    183 
    +                        <property name="can-focus">True</property>
    184 
    +                        <property name="hexpand">True</property>
    185 
    +                        <property name="primary-icon-name">edit-find-symbolic</property>
    186 
    +                        <property name="primary-icon-activatable">False</property>
    187 
    +                        <property name="primary-icon-sensitive">False</property>
    188 
    +                        <property name="placeholder-text" translatable="yes">Search…</property>
    189 
    +                      </object>
    190 
    +                      <packing>
    191 
    +                        <property name="expand">False</property>
    192 
    +                        <property name="fill">True</property>
    193 
    +                        <property name="position">1</property>
    194 
    +                      </packing>
    195 
    +                    </child>
    196 
    +                  </object>
    197 
    +                  <packing>
    198 
    +                    <property name="left-attach">0</property>
    199 
    +                    <property name="top-attach">1</property>
    200 
    +                  </packing>
    201 
    +                </child>
    202 
    +                <child>
    203 
    +                  <object class="GtkBox">
    204 
    +                    <property name="visible">True</property>
    205 
    +                    <property name="can-focus">False</property>
    206 
    +                    <property name="spacing">12</property>
    207 
    +                    <child>
    208 
    +                      <object class="GtkLabel" id="workspace_label">
    209 
    +                        <property name="visible">True</property>
    210 
    +                        <property name="can-focus">False</property>
    211 
    +                        <property name="label">Workspace Label</property>
    212 
    +                        <property name="ellipsize">end</property>
    213 
    +                        <style>
    214 
    +                          <class name="large-header"/>
    215 
    +                        </style>
    216 
    +                      </object>
    217 
    +                      <packing>
    218 
    +                        <property name="expand">False</property>
    219 
    +                        <property name="fill">True</property>
    220 
    +                        <property name="position">0</property>
    221 
    +                      </packing>
    222 
    +                    </child>
    223 
    +                    <child>
    224 
    +                      <object class="GtkButton" id="edit_workspace_button">
    225 
    +                        <property name="visible">True</property>
    226 
    +                        <property name="can-focus">True</property>
    227 
    +                        <property name="receives-default">True</property>
    228 
    +                        <property name="tooltip-text" translatable="yes">Edit Workspace</property>
    229 
    +                        <property name="relief">none</property>
    230 
    +                        <child>
    231 
    +                          <object class="GtkImage">
    232 
    +                            <property name="visible">True</property>
    233 
    +                            <property name="can-focus">False</property>
    234 
    +                            <property name="icon-name">document-edit-symbolic</property>
    235 
    +                          </object>
    236 
    +                        </child>
    237 
    +                        <style>
    238 
    +                          <class name="flat"/>
    239 
    +                        </style>
    240 
    +                      </object>
    241 
    +                      <packing>
    242 
    +                        <property name="expand">False</property>
    243 
    +                        <property name="fill">True</property>
    244 
    +                        <property name="pack-type">end</property>
    245 
    +                        <property name="position">1</property>
    246 
    +                      </packing>
    247 
    +                    </child>
    248 
    +                  </object>
    249 
    +                  <packing>
    250 
    +                    <property name="left-attach">0</property>
    251 
    +                    <property name="top-attach">0</property>
    252 
    +                  </packing>
    253 
    +                </child>
    254 
    +                <style>
    255 
    +                  <class name="chatlist-top-bar"/>
    256 
    +                </style>
    257 
    +              </object>
    258 
    +              <packing>
    259 
    +                <property name="left-attach">0</property>
    260 
    +                <property name="top-attach">0</property>
    261 
    +              </packing>
    262 
    +            </child>
    263 
    +            <child>
    264 
    +              <placeholder/>
    265 
    +            </child>
    266 
    +            <child>
    267 
    +              <placeholder/>
    268 
    +            </child>
    269 
    +            <child>
    270 
    +              <placeholder/>
    271 
    +            </child>
    272 
    +            <child>
    273 
    +              <placeholder/>
    274 
    +            </child>
    275 
    +            <child>
    276 
    +              <placeholder/>
    277 
    +            </child>
    278 
    +            <child>
    279 
    +              <placeholder/>
    280 
    +            </child>
    281 
    +            <child>
    282 
    +              <placeholder/>
    283 
    +            </child>
    284 
    +            <child>
    285 
    +              <placeholder/>
    286 
    +            </child>
    287 
    +          </object>
    288 
    +          <packing>
    289 
    +            <property name="resize">True</property>
    290 
    +            <property name="shrink">True</property>
    291 
    +          </packing>
    292 
    +        </child>
    293 
    +        <child>
    294 
    +          <!-- n-columns=3 n-rows=3 -->
    295 
    +          <object class="GtkGrid" id="right_grid">
    296 
    +            <property name="visible">True</property>
    297 
    +            <property name="can-focus">False</property>
    298 
    +            <property name="hexpand">True</property>
    299 
    +            <property name="vexpand">True</property>
    300 
    +            <child>
    301 
    +              <placeholder/>
    302 
    +            </child>
    303 
    +            <child>
    304 
    +              <placeholder/>
    305 
    +            </child>
    306 
    +            <child>
    307 
    +              <placeholder/>
    308 
    +            </child>
    309 
    +            <child>
    310 
    +              <placeholder/>
    311 
    +            </child>
    312 
    +            <child>
    313 
    +              <placeholder/>
    314 
    +            </child>
    315 
    +            <child>
    316 
    +              <placeholder/>
    317 
    +            </child>
    318 
    +            <child>
    319 
    +              <placeholder/>
    320 
    +            </child>
    321 
    +            <child>
    322 
    +              <placeholder/>
    323 
    +            </child>
    324 
    +            <child>
    325 
    +              <placeholder/>
    326 
    +            </child>
    327 
    +          </object>
    328 
    +          <packing>
    329 
    +            <property name="resize">True</property>
    330 
    +            <property name="shrink">True</property>
    331 
    +          </packing>
    332 
    +        </child>
    333 
    +      </object>
    334 
    +      <packing>
    335 
    +        <property name="left-attach">1</property>
    336 
    +        <property name="top-attach">0</property>
    337 
    +      </packing>
    338 
    +    </child>
    339 
    +    <child>
    340 
    +      <placeholder/>
    341 
    +    </child>
    327 342 
         <child>
    328 343 
           <placeholder/>
    329 344 
         </child>

  • gajim/data/style/gajim.css
    ... ... @@ -105,12 +105,8 @@
    105 105 
     }
    106 106 
     .chatlist-top-bar {
    107 107 
     	padding: 12px;
    108 
    -	border-right: 1px solid @unfocused_borders;
    109 108 
     	border-bottom: 1px solid @unfocused_borders;
    110 109 
     }
    111 
    -.chatlist-stack {
    112 
    -	border-right: 1px solid @unfocused_borders;
    113 
    -}
    114 110 
     .revealer-close-button {
    115 111 
         padding: 0px;
    116 112 
     }

  • gajim/gtk/chat_list.py
    ... ... @@ -24,7 +24,6 @@ def __init__(self, workspace_id):
    24 24 
             self._chats = {}
    25 25 
             self._current_filter_text = ''
    26 26 
             self._workspace_id = workspace_id
    27 
    -        self.set_size_request(250, -1)
    28 27
    29 28 
             self.show_all()
    30 29

  • gajim/gtk/chat_list_stack.py
    1 1
    2 
    -from gi.repository import GLib
    3 2 
     from gi.repository import Gtk
    4 3
    5 4 
     from gajim.common import app
    ... ... @@ -10,8 +9,7 @@
    10 9 
     class ChatListStack(Gtk.Stack):
    11 10 
         def __init__(self, ui, chat_stack):
    12 11 
             Gtk.Stack.__init__(self)
    13 
    -        self.get_style_context().add_class('chatlist-stack')
    14 
    -
    12 
    +        self.set_hexpand(True)
    15 13 
             self.set_vexpand(True)
    16 14
    17 15 
             self._ui = ui

    • —
    View it on GitLab.
    You're receiving this email because of your account on dev.gajim.org. If you'd like to receive fewer emails, you can adjust your notification settings.