[polari] ui: Add selection mode toolbar
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [polari] ui: Add selection mode toolbar
- Date: Thu, 8 Aug 2013 13:15:14 +0000 (UTC)
commit cc24ae7e872b6a1c41ea3f251dacc6de93f30fa9
Author: Florian Müllner <fmuellner gnome org>
Date: Tue Jul 30 21:48:22 2013 +0200
ui: Add selection mode toolbar
While selection mode is active, we'll show an additional toolbar which
holds the mode-specific actions; for now, this will just be "leave".
data/resources/application.css | 1 +
data/resources/main-window.ui | 76 ++++++++++++++++++++++++++++++++++++---
2 files changed, 71 insertions(+), 6 deletions(-)
---
diff --git a/data/resources/application.css b/data/resources/application.css
index 7f7c4e2..863f973 100644
--- a/data/resources/application.css
+++ b/data/resources/application.css
@@ -18,6 +18,7 @@
border-width: 0 0 1px 1px;
}
+.polari-selection-toolbar,
.polari-input-area {
background-color: @polari_dark_bg_color;
border-color: @borders;
diff --git a/data/resources/main-window.ui b/data/resources/main-window.ui
index 4d30ab0..9994c6b 100644
--- a/data/resources/main-window.ui
+++ b/data/resources/main-window.ui
@@ -200,14 +200,71 @@
<class name="polari-room-list"/>
</style>
<child>
- <object class="GtkScrolledWindow" id="room_list_scrollview">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="vexpand">True</property>
- <property name="hexpand">True</property>
+ <property name="hexpand">False</property>
+ <property name="orientation">vertical</property>
<child>
- <placeholder/>
+ <object class="GtkScrolledWindow" id="room_list_scrollview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vexpand">True</property>
+ <property name="hexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkRevealer" id="selection_toolbar_revealer">
+ <property name="visible">True</property>
+ <property name="transition_type">slide-up</property>
+ <child>
+ <object class="GtkToolbar" id="selection_toolbar">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">False</property>
+ <property name="show_arrow">False</property>
+ <style>
+ <class name="menubar"/>
+ <class name="polari-selection-toolbar"/>
+ </style>
+ <child>
+ <object class="GtkSeparatorToolItem" id="toolbutton1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="draw">False</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolItem" id="toolbutton2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkButton" id="button5">
+ <property name="label" translatable="yes">_Leave</property>
+ <property name="width_request">70</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="action_name">app.leave-selected-rooms</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
</child>
</object>
</child>
@@ -361,5 +418,12 @@
<widget name="frame1"/>
</widgets>
</object>
+ <object class="GtkSizeGroup" id="bottom_size_group">
+ <property name="mode">vertical</property>
+ <widgets>
+ <widget name="selection_toolbar"/>
+ <widget name="main_input_area"/>
+ </widgets>
+ </object>
</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]