Replaced stackswitcher with togglebutton

Stylechanges
geigi · Oct 23, 2017 · ea7e2a5 · ea7e2a5
1 parent 39d299e
commit ea7e2a5
Show file tree

Hide file tree

Showing 4 changed files with 99 additions and 6 deletions.
diff --git a/cozy/ui.py b/cozy/ui.py
@@ -141,6 +141,8 @@ def __init_window(self):
  self.progress_scale = self.window_builder.get_object("progress_scale")
  self.current_label = self.window_builder.get_object("current_label")
  self.remaining_label = self.window_builder.get_object("remaining_label")
+ self.author_toggle_button = self.window_builder.get_object("author_toggle_button")
+ self.reader_toggle_button = self.window_builder.get_object("reader_toggle_button")
 
  # get settings window
  self.settings_window = self.settings_builder.get_object("settings_window")
@@ -189,6 +191,8 @@ def __init_window(self):
  # button actions
  self.play_button.connect("clicked", self.__on_play_pause_clicked)
  self.prev_button.connect("clicked", self.__on_rewind_clicked)
+ self.author_toggle_button.connect("toggled", self.__toggle_author)
+ self.reader_toggle_button.connect("toggled", self.__toggle_reader)
 
  # DEMO #
  scale = self.window_builder.get_object("progress_scale")
@@ -567,6 +571,27 @@ def __on_rewind_clicked(self, button):
  else:
  self.progress_scale.set_value(0)
 
+ def __toggle_reader(self, button):
+ """
+ Switch to reader selection
+ """
+ if self.reader_toggle_button.get_active():
+ self.author_toggle_button.set_active(False)
+ self.sort_stack.props.visible_child_name = "reader"
+ elif self.author_toggle_button.get_active() is False:
+ self.reader_toggle_button.set_active(True)
+
+ def __toggle_author(self, button):
+ """
+ Switch to author selection
+ """
+ if self.author_toggle_button.get_active():
+ self.reader_toggle_button.set_active(False)
+ self.sort_stack.props.visible_child_name = "author"
+ elif self.reader_toggle_button.get_active() is False:
+ self.author_toggle_button.set_active(True)
+
+
  def __on_gst_message(self, bus, message):
  """
  Listen to and handle all gst player messages that are important for the ui.

diff --git a/data/ui/application.css b/data/ui/application.css
@@ -21,4 +21,8 @@
 
 .box_hover {
  background: shade(@theme_tooltip_bg_color, 1.1)
+}
+
+.no_frame {
+ border-style: none;
 }
diff --git a/data/ui/application_legacy.css b/data/ui/application_legacy.css
@@ -22,3 +22,7 @@
 .box_hover {
  background: shade(@theme_bg_color, 0.9)
 }
+
+.no_frame {
+ border-style: none;
+}
diff --git a/data/ui/main_window.ui b/data/ui/main_window.ui
@@ -45,15 +45,66 @@
  <property name="can_focus">False</property>
  <property name="orientation">vertical</property>
  <child>
- <object class="GtkStackSwitcher" id="sort_stack_switcher">
+ <object class="GtkBox">
  <property name="visible">True</property>
  <property name="can_focus">False</property>
- <property name="halign">center</property>
+ <property name="margin_bottom">2</property>
  <property name="hexpand">True</property>
- <property name="stack">sort_stack</property>
- <style>
- <class name="bold"/>
- </style>
+ <child>
+ <object class="GtkToggleButton" id="author_toggle_button">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
+ <property name="receives_default">True</property>
+ <property name="hexpand">True</property>
+ <property name="relief">none</property>
+ <property name="active">True</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="width_request">90</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;Author&lt;/big&gt;</property>
+ <property name="use_markup">True</property>
+ <style>
+ <class name="no_frame"/>
+ </style>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="reader_toggle_button">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="focus_on_click">False</property>
+ <property name="receives_default">True</property>
+ <property name="hexpand">True</property>
+ <property name="relief">none</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="width_request">90</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">&lt;big&gt;Reader&lt;/big&gt;</property>
+ <property name="use_markup">True</property>
+ <style>
+ <class name="no_frame"/>
+ </style>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
  </object>
  <packing>
  <property name="expand">False</property>
@@ -85,6 +136,9 @@
  </child>
  </object>
  </child>
+ <style>
+ <class name="no_frame"/>
+ </style>
  </object>
  <packing>
  <property name="name">author</property>
@@ -108,6 +162,9 @@
  </child>
  </object>
  </child>
+ <style>
+ <class name="no_frame"/>
+ </style>
  </object>
  <packing>
  <property name="name">reader</property>
@@ -160,6 +217,9 @@
  </child>
  </object>
  </child>
+ <style>
+ <class name="no_frame"/>
+ </style>
  </object>
  <packing>
  <property name="resize">True</property>