Drop Granite completely

bleakgrey · Sep 5, 2020 · 748808d · 748808d
1 parent e0a7a43
commit 748808d
Show file tree

Hide file tree

Showing 32 changed files with 705 additions and 725 deletions.
diff --git a/README.md b/README.md
@@ -20,7 +20,6 @@ If the options above are not available to you, you can build the app from source
     - [x] valac
     - [x] libgtk-3-dev
     - [x] libsoup2.4-dev
-    - [x] libgranite-dev
     - [x] libjson-glib-dev
     - [ ] libhandy-1.0-dev (>= 0.83.0)
 

diff --git a/data/app.css b/data/app.css
@@ -2,6 +2,12 @@
 	border-radius: 4px;
 }
 
+.chip {
+  padding: 4px 12px;
+  border-radius: 4px;
+  border: 1px solid black;
+}
+
 .attachment {
 	border-radius: 6px;
 	background: rgba (150, 150, 150, 0.2);
@@ -11,10 +17,6 @@
 .attachment .pic {
 	border-radius: 6px;
 }
-.attachment .chip {
-	padding: 6px;
-	border-radius:6px;
-}
 
 .header-title-button {
 	margin: 0px;

diff --git a/data/gresource.xml b/data/gresource.xml
@@ -9,7 +9,7 @@
         <file preprocess="xml-stripblanks">ui/widgets/accounts_button.ui</file>
         <file preprocess="xml-stripblanks">ui/widgets/accounts_button_item.ui</file>
         <file preprocess="xml-stripblanks">ui/widgets/profile_field_row.ui</file>
-        <file preprocess="xml-stripblanks">ui/widgets/timeline_filter.ui</file>
+        <file preprocess="xml-stripblanks">ui/widgets/timeline_menu.ui</file>
         <file preprocess="xml-stripblanks">ui/widgets/list_item.ui</file>
         <file preprocess="xml-stripblanks">ui/widgets/list_editor_item.ui</file>
         <file preprocess="xml-stripblanks">ui/widgets/attachment_slot.ui</file>
@@ -18,5 +18,6 @@
         <file preprocess="xml-stripblanks">ui/dialogs/main.ui</file>
         <file preprocess="xml-stripblanks">ui/dialogs/preferences.ui</file>
         <file preprocess="xml-stripblanks">ui/dialogs/list_editor.ui</file>
+        <file preprocess="xml-stripblanks">ui/menus.ui</file>
     </gresource>
 </gresources>
diff --git a/data/ui/dialogs/compose.ui b/data/ui/dialogs/compose.ui
@@ -4,7 +4,6 @@
   <requires lib="gtk+" version="3.20"/>
   <template class="TootleDialogsCompose" parent="GtkWindow">
     <property name="can_focus">False</property>
-    <property name="modal">True</property>
     <property name="default_width">500</property>
     <property name="default_height">250</property>
     <property name="type_hint">dialog</property>
@@ -360,6 +359,7 @@
                   <object class="GtkLabel" id="commit_label">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Publish</property>
                   </object>
                   <packing>
                     <property name="name">ready</property>

diff --git a/data/ui/dialogs/main.ui b/data/ui/dialogs/main.ui
@@ -29,7 +29,7 @@
               </object>
               <packing>
                 <property name="name">0</property>
-                <property name="title" translatable="no">0</property>
+                <property name="title">0</property>
               </packing>
             </child>
           </object>
@@ -145,6 +145,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
+                    <property name="tooltip_text" translatable="yes">Compose</property>
                     <child>
                       <object class="GtkImage">
                         <property name="visible">True</property>

diff --git a/data/ui/dialogs/preferences.ui b/data/ui/dialogs/preferences.ui
@@ -42,7 +42,7 @@
 							<property name="title" translatable="yes">Behavior</property>
 							<child>
 								<object class="HdyActionRow">
-									<property name="visible">True</property>
+									<property name="visible">False</property>
 									<property name="activatable_widget">autostart</property>
 									<property name="title" translatable="yes">Autostart</property>
 									<property name="subtitle" translatable="yes">Start minimized at boot</property>
@@ -56,7 +56,7 @@
 							</child>
 							<child>
 								<object class="HdyActionRow">
-									<property name="visible">True</property>
+									<property name="visible">False</property>
 									<property name="activatable_widget">work_in_background</property>
 									<property name="title" translatable="yes">Background work</property>
 									<property name="subtitle" translatable="yes">Receive notifications even when the app window is closed</property>

diff --git a/data/ui/menus.ui b/data/ui/menus.ui
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+
+  <menu id="profile-menu">
+
+    <section>
+      <submenu id="profile-filter-menu">
+        <attribute name="label" translatable="yes">Filter</attribute>
+        <item>
+          <attribute name="label" translatable="yes">Posts</attribute>
+          <attribute name="action">view.source</attribute>
+          <attribute name="target">statuses</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Following</attribute>
+          <attribute name="action">view.source</attribute>
+          <attribute name="target">following</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Followers</attribute>
+          <attribute name="action">view.source</attribute>
+          <attribute name="target">followers</attribute>
+        </item>
+
+        <section>
+          <item>
+            <attribute name="label" translatable="yes">With Replies</attribute>
+            <attribute name="action">view.include-replies</attribute>
+            <attribute name="hidden-when">action-disabled</attribute>
+          </item>
+          <item>
+            <attribute name="label" translatable="yes">With Media</attribute>
+            <attribute name="action">view.only-media</attribute>
+            <attribute name="hidden-when">action-disabled</attribute>
+          </item>
+        </section>
+
+      </submenu>
+    </section>
+
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Mention…</attribute>
+        <attribute name="action">view.mention</attribute>
+        <attribute name="target">public</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Direct Message…</attribute>
+        <attribute name="action">view.mention</attribute>
+        <attribute name="target">direct</attribute>
+      </item>
+    </section>
+
+    <section>
+      <!-- <submenu> -->
+        <!-- <attribute name="label" translatable="yes">Moderation</attribute> -->
+        <item>
+          <attribute name="label" translatable="yes">Hide Boosts</attribute>
+          <attribute name="action">view.hiding_reblogs</attribute>
+          <attribute name="hidden-when">action-disabled</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Mute</attribute>
+          <attribute name="action">view.muting</attribute>
+        </item>
+        <section>
+          <item>
+            <attribute name="label" translatable="yes">Report</attribute>
+            <attribute name="action">view.report</attribute>
+            <!-- TODO: Reporting users -->
+            <attribute name="hidden-when">action-missing</attribute>
+          </item>
+          <item>
+            <attribute name="label" translatable="yes">Block</attribute>
+            <attribute name="action">view.blocking</attribute>
+          </item>
+          <item>
+            <attribute name="label" translatable="yes">Block Domain</attribute>
+            <attribute name="action">view.domain_blocking</attribute>
+            <attribute name="hidden-when">action-disabled</attribute>
+          </item>
+        </section>
+      <!-- </submenu> -->
+    </section>
+
+  </menu>
+
+</interface>
diff --git a/data/ui/views/base.ui b/data/ui/views/base.ui
@@ -54,10 +54,12 @@
                                     <property name="height_request">128</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="opacity">0.30196078431372547</property>
                                     <property name="pixel_size">128</property>
                                     <property name="icon_name">com.github.bleakgrey.tootle-symbolic</property>
                                     <property name="icon_size">0</property>
+                                    <style>
+                                      <class name="dim-label"/>
+                                    </style>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -69,7 +71,6 @@
                                   <object class="GtkStack" id="status_stack">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="opacity">0.5019607843137255</property>
                                     <property name="transition_type">crossfade</property>
                                     <child>
                                       <object class="GtkLabel" id="status_message_label">
@@ -79,7 +80,6 @@
                                       </object>
                                       <packing>
                                         <property name="name">message</property>
-                                        <property name="title" translatable="no">page0</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -92,10 +92,12 @@
                                       </object>
                                       <packing>
                                         <property name="name">spinner</property>
-                                        <property name="title" translatable="no">page1</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
+                                    <style>
+                                      <class name="dim-label"/>
+                                    </style>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>