Преглед изворни кода

Do not show tag list for now

Matthias Vogelgesang пре 7 година
родитељ
комит
811b59d7e4
2 измењених фајлова са 7 додато и 41 уклоњено
  1. 2 21
      src/iridium-window.c
  2. 5 20
      src/iridium-window.ui

+ 2 - 21
src/iridium-window.c

@@ -40,7 +40,6 @@ struct _IridiumWindow
   GSettings         *window_state;
 
   GtkHeaderBar      *header_bar;
-  GtkListBox        *tag_list;
   GtkListBox        *note_list;
   GtkWidget         *title_entry;
   GtkWidget         *source_view;
@@ -179,23 +178,10 @@ preview_toggled (GSimpleAction *action,
 static gboolean
 note_visible (IridiumNoteRow *row, IridiumWindow *window)
 {
-  IridiumNote *note;
-  IridiumTagRow *tag_row;
-
-  tag_row = IRIDIUM_TAG_ROW (gtk_list_box_get_selected_row (window->tag_list));
-
-  if (tag_row == NULL)
-    return TRUE;
-
-  note = iridium_note_row_get_note (row);
-
-  if (!iridium_note_has_tag (note, iridium_tag_row_get_tag (tag_row))) {
-    return FALSE;
-  }
-
   if (gtk_search_bar_get_search_mode (window->search_bar) &&
       gtk_entry_get_text_length (GTK_ENTRY (window->search_entry)) > 0) {
-    return iridium_note_matches_fuzzy (note, gtk_entry_get_text (GTK_ENTRY (window->search_entry)));
+    return iridium_note_matches_fuzzy (iridium_note_row_get_note (row),
+                                       gtk_entry_get_text (GTK_ENTRY (window->search_entry)));
   }
 
   return TRUE;
@@ -257,11 +243,8 @@ on_load_finished (GObject *object,
       gtk_list_box_insert (self->note_list, iridium_note_row_new (note), -1);
     }
 
-    gtk_list_box_insert (self->tag_list, iridium_tag_row_new (tag_all), -1);
     g_list_free (notes);
-
     gtk_widget_show_all (GTK_WIDGET (self->note_list));
-    gtk_widget_show_all (GTK_WIDGET (self->tag_list));
   }
   else if (error != NULL) {
     show_error_dialog (self, error);
@@ -347,7 +330,6 @@ on_show (IridiumWindow *self, gpointer user_data)
   g_free (server);
   g_free (email);
 
-  gtk_widget_show_all (GTK_WIDGET (self->tag_list));
   gtk_widget_show_all (GTK_WIDGET (self->note_list));
 }
 
@@ -454,7 +436,6 @@ iridium_window_class_init (IridiumWindowClass *klass)
 
   gtk_widget_class_set_template_from_resource (widget_class, "/net/bloerg/Iridium/iridium-window.ui");
   gtk_widget_class_bind_template_child (widget_class, IridiumWindow, header_bar);
-  gtk_widget_class_bind_template_child (widget_class, IridiumWindow, tag_list);
   gtk_widget_class_bind_template_child (widget_class, IridiumWindow, note_list);
   gtk_widget_class_bind_template_child (widget_class, IridiumWindow, source_view);
   gtk_widget_class_bind_template_child (widget_class, IridiumWindow, title_entry);

+ 5 - 20
src/iridium-window.ui

@@ -111,34 +111,19 @@
                 <property name="name">main-pane</property>
                 <property name="visible">True</property>
                 <child>
-                  <object class="GtkBox">
+                  <object class="GtkScrolledWindow">
                     <property name="visible">True</property>
-                    <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+                    <property name="hexpand">True</property>
+                    <property name="min-content-width">200</property>
                     <child>
-                      <object class="GtkListBox" id="tag_list">
+                      <object class="GtkListBox" id="note_list">
                         <property name="visible">True</property>
-                        <signal name="row-selected" handler="on_tag_selected" object="IridiumWindow"/>
+                        <signal name="row-selected" handler="on_note_selected" object="IridiumWindow"/>
                         <style>
                           <class name="list-box"/>
                         </style>
                       </object>
                     </child>
-                    <child>
-                      <object class="GtkScrolledWindow">
-                        <property name="visible">True</property>
-                        <property name="hexpand">True</property>
-                        <property name="min-content-width">200</property>
-                        <child>
-                          <object class="GtkListBox" id="note_list">
-                            <property name="visible">True</property>
-                            <signal name="row-selected" handler="on_note_selected" object="IridiumWindow"/>
-                            <style>
-                              <class name="list-box"/>
-                            </style>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
                   </object>
                 </child>
                 <child>