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

Commits:

4 changed files:

Changes:

  • gajim/data/gui/chat_control.ui
    ... ... @@ -16,12 +16,6 @@
    16 16
                 <property name="visible">True</property>
    
    17 17
                 <property name="can-focus">False</property>
    
    18 18
                 <property name="orientation">vertical</property>
    
    19
    -            <child>
    
    20
    -              <placeholder/>
    
    21
    -            </child>
    
    22
    -            <child>
    
    23
    -              <placeholder/>
    
    24
    -            </child>
    
    25 19
                 <child>
    
    26 20
                   <object class="GtkOverlay" id="conv_view_overlay">
    
    27 21
                     <property name="visible">True</property>
    
    ... ... @@ -36,23 +30,6 @@
    36 30
                     <property name="position">2</property>
    
    37 31
                   </packing>
    
    38 32
                 </child>
    
    39
    -            <child>
    
    40
    -              <object class="GtkSeparator">
    
    41
    -                <property name="visible">True</property>
    
    42
    -                <property name="can-focus">False</property>
    
    43
    -                <style>
    
    44
    -                  <class name="chatcontrol-separator"/>
    
    45
    -                </style>
    
    46
    -              </object>
    
    47
    -              <packing>
    
    48
    -                <property name="expand">False</property>
    
    49
    -                <property name="fill">True</property>
    
    50
    -                <property name="position">3</property>
    
    51
    -              </packing>
    
    52
    -            </child>
    
    53
    -            <child>
    
    54
    -              <placeholder/>
    
    55
    -            </child>
    
    56 33
               </object>
    
    57 34
               <packing>
    
    58 35
                 <property name="index">-1</property>
    

  • gajim/data/gui/groupchat_control.ui
    ... ... @@ -71,12 +71,6 @@
    71 71
                         <property name="margin-end">4</property>
    
    72 72
                         <property name="hexpand">True</property>
    
    73 73
                         <property name="orientation">vertical</property>
    
    74
    -                    <child>
    
    75
    -                      <placeholder/>
    
    76
    -                    </child>
    
    77
    -                    <child>
    
    78
    -                      <placeholder/>
    
    79
    -                    </child>
    
    80 74
                         <child>
    
    81 75
                           <object class="GtkOverlay" id="conv_view_overlay">
    
    82 76
                             <property name="visible">True</property>
    
    ... ... @@ -91,23 +85,6 @@
    91 85
                             <property name="position">2</property>
    
    92 86
                           </packing>
    
    93 87
                         </child>
    
    94
    -                    <child>
    
    95
    -                      <object class="GtkSeparator">
    
    96
    -                        <property name="visible">True</property>
    
    97
    -                        <property name="can-focus">False</property>
    
    98
    -                        <style>
    
    99
    -                          <class name="chatcontrol-separator"/>
    
    100
    -                        </style>
    
    101
    -                      </object>
    
    102
    -                      <packing>
    
    103
    -                        <property name="expand">False</property>
    
    104
    -                        <property name="fill">True</property>
    
    105
    -                        <property name="position">3</property>
    
    106
    -                      </packing>
    
    107
    -                    </child>
    
    108
    -                    <child>
    
    109
    -                      <placeholder/>
    
    110
    -                    </child>
    
    111 88
                       </object>
    
    112 89
                       <packing>
    
    113 90
                         <property name="expand">False</property>
    

  • gajim/data/style/gajim.css
    ... ... @@ -6,7 +6,7 @@ .chatcontrol-actionbar-button {
    6 6
     	border: none;
    
    7 7
     }
    
    8 8
     
    
    9
    -.message-action-box { margin: 0px 13px 8px 8px }
    
    9
    +.message-action-box { margin: 8px 13px 8px 8px }
    
    10 10
     
    
    11 11
     .no-border { border: none; }
    
    12 12
     .scrolled-no-border { border: none; }
    

  • gajim/gtk/chat_stack.py
    ... ... @@ -60,6 +60,7 @@ def __init__(self):
    60 60
             box.add(self._chat_banner)
    
    61 61
             box.add(Gtk.Separator())
    
    62 62
             box.add(self._control_stack)
    
    63
    +        box.add(Gtk.Separator())
    
    63 64
             box.add(self._message_action_box)
    
    64 65
     
    
    65 66
             self._current_contact = None