X-Git-Url: https://git.wpitchoune.net/gitweb/?p=prss.git;a=blobdiff_plain;f=src%2Fglade%2Fprss.glade;h=1c7a070d055ed443f5f748b92efc0575c1bb1045;hp=6bbbd31c7d7c2cba1f0da0472026a6283fd6f4e5;hb=defb62b702251f80cc0e0847b6872eb95a6fc9d0;hpb=54c2b8d3bd8fe1a775263657d4c2d317de37f1e6

diff --git a/src/glade/prss.glade b/src/glade/prss.glade
index 6bbbd31..1c7a070 100644
--- a/src/glade/prss.glade
+++ b/src/glade/prss.glade
@@ -5,7 +5,7 @@
     <property name="label" translatable="yes">Refresh</property>
     <property name="stock_id">gtk-refresh</property>
   </object>
-  <object class="GtkListStore" id="headline_store">
+  <object class="GtkListStore" id="feed_store">
     <columns>
       <!-- column-name gchararray1 -->
       <column type="gchararray"/>
@@ -13,12 +13,16 @@
       <column type="gint"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="feed_store">
+  <object class="GtkListStore" id="headline_store">
     <columns>
-      <!-- column-name gchararray1 -->
+      <!-- column-name title -->
       <column type="gchararray"/>
-      <!-- column-name gpointer1 -->
+      <!-- column-name id -->
       <column type="gint"/>
+      <!-- column-name date -->
+      <column type="gchararray"/>
+      <!-- column-name gint1 -->
+      <column type="gint64"/>
     </columns>
   </object>
   <object class="GtkListStore" id="liststore1">
@@ -35,6 +39,11 @@
       </row>
     </data>
   </object>
+  <object class="GtkAction" id="preferences_action">
+    <property name="label" translatable="yes">Preferences</property>
+    <property name="stock_id">gtk-preferences</property>
+    <signal name="activate" handler="preferences_action_activate_cbk" swapped="no"/>
+  </object>
   <object class="GtkDialog" id="settings_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -290,11 +299,12 @@
                     <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem1">
                         <property name="label">gtk-preferences</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="related_action">preferences_action</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <signal name="activate" handler="settings_activate_cbk" swapped="no"/>
                       </object>
                     </child>
                     <child>
@@ -366,6 +376,19 @@
                 <property name="homogeneous">True</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkToolButton" id="preferences">
+                <property name="related_action">preferences_action</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">toolbutton1</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -377,6 +400,8 @@
           <object class="GtkPaned" id="paned1">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="margin_left">4</property>
+            <property name="margin_right">4</property>
             <property name="position">200</property>
             <property name="position_set">True</property>
             <child>
@@ -438,16 +463,20 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="model">headline_store</property>
+                        <property name="reorderable">True</property>
                         <signal name="cursor-changed" handler="headline_cursor_changed_cbk" swapped="no"/>
                         <signal name="row-activated" handler="headline_row_activated_cbk" swapped="no"/>
                         <child internal-child="selection">
                           <object class="GtkTreeSelection" id="treeview-selection2"/>
                         </child>
                         <child>
-                          <object class="GtkTreeViewColumn" id="treeviewcolumn2">
-                            <property name="spacing">3</property>
-                            <property name="max_width">0</property>
+                          <object class="GtkTreeViewColumn" id="col_headine_title">
+                            <property name="resizable">True</property>
+                            <property name="sizing">fixed</property>
+                            <property name="fixed_width">300</property>
                             <property name="title" translatable="yes">Headline</property>
+                            <property name="reorderable">True</property>
+                            <property name="sort_column_id">0</property>
                             <child>
                               <object class="GtkCellRendererText" id="cellrenderertext1"/>
                               <attributes>
@@ -456,6 +485,22 @@
                             </child>
                           </object>
                         </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="col_headine_date">
+                            <property name="resizable">True</property>
+                            <property name="sizing">fixed</property>
+                            <property name="fixed_width">50</property>
+                            <property name="title" translatable="yes">Date</property>
+                            <property name="reorderable">True</property>
+                            <property name="sort_column_id">3</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="cellrenderertext3"/>
+                              <attributes>
+                                <attribute name="markup">2</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
@@ -465,12 +510,82 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkScrolledWindow" id="webkit_window">
+                  <object class="GtkBox" id="box2">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="shadow_type">in</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkFrame" id="frame1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">in</property>
+                        <child>
+                          <object class="GtkGrid" id="grid3">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_left">4</property>
+                            <child>
+                              <object class="GtkLabel" id="headline_title">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="single_line_mode">True</property>
+                                <attributes>
+                                  <attribute name="weight" value="bold"/>
+                                  <attribute name="scale" value="1.5"/>
+                                </attributes>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="headline_date">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                                <property name="yalign">0</property>
+                                <attributes>
+                                  <attribute name="weight" value="light"/>
+                                </attributes>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">1</property>
+                                <property name="width">1</property>
+                                <property name="height">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                        <child type="label_item">
+                          <placeholder/>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
                     <child>
-                      <placeholder/>
+                      <object class="GtkScrolledWindow" id="webkit_window">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="shadow_type">in</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
                   </object>
                   <packing>