Merge branch 'feature-automaticarrange'

khurshid-alam · Nov 30, 2018 · d0fc273 · d0fc273
2 parents 530189e + 838913b
commit d0fc273
Show file tree

Hide file tree

Showing 40 changed files with 4,018 additions and 1,205 deletions.
diff --git a/data/com.github.spheras.desktopfolder.gschema.xml b/data/com.github.spheras.desktopfolder.gschema.xml
@@ -5,10 +5,20 @@
         <value value="1" nick="SCALE"/>
         <value value="2" nick="STORE"/>
     </enum>
+    <enum id="arrangement">
+        <value value="1" nick="FREE"/>
+        <value value="2" nick="GRID"/>
+        <value value="3" nick="MANAGED"/>
+    </enum>
 
   <schema path="/com/github/spheras/desktopfolder/"
   id="com.github.spheras.desktopfolder"
   gettext-domain="com.github.spheras.desktopfolder">
+    <key name="icons-on-desktop" type="b">
+      <default>true</default>
+      <summary>Icons on Desktop Panel</summary>
+      <description>Whether to show icons on Desktop Panel or not</description>
+    </key>
     <key name="desktop-panel" type="b">
       <default>true</default>
       <summary>Desktop Panel over Desktop</summary>
@@ -19,6 +29,16 @@
       <summary>Resolution Change Strategy</summary>
       <description>How the widgets should be adapted to different screen resolutions</description>
     </key>
+    <key name="default-arrangement" enum="arrangement">
+      <default>'GRID'</default>
+      <summary>Default Panel Arrangement</summary>
+      <description>Define whats the default arrangement strategy for panels</description>
+    </key>
+    <key name="default-arrangement-padding" type="i">
+      <default>10</default>
+      <summary>Default Arrangement Padding</summary>
+      <description>The Default Arrangement Padding Between Items</description>
+    </key>
     <key name="show-desktopfolder" type="b">
       <default>true</default>
       <summary>Have DesktopFolder handle the desktop</summary>

diff --git a/data/css/Application.css b/data/css/Application.css
@@ -45,6 +45,19 @@
     color: @colorForegroundHEADLESS;
 }
 
+/* Windows opacity animation */
+.df_fadingwindow {
+    transition: opacity 160ms cubic-bezier(0.455, 0.030, 0.515, 0.955);
+}
+
+.df_fadein {
+    opacity: 1;
+}
+
+.df_fadeout {
+    opacity: 0;
+}
+
 /* Panel buttons (trash and properties) */
 .df_folder .df_titlebar_button {
     opacity: 0.75;
@@ -65,6 +78,12 @@
     -gtk-icon-shadow: 0 0 2px rgba(0,0,0,0.3), 0 1px 2px rgba(0,0,0,0.6);
 }
 
+.df_item entry{
+  padding:0px;
+  min-width:0px;
+  margin:0px;
+}
+
 /* ----------------------- */
 
 /* BODY COLORS */
@@ -330,7 +349,6 @@ window decoration{
 
 .df_item{
     border-radius:7px;
-    transition: background 100ms cubic-bezier(0.455, 0.030, 0.515, 0.955);
 }
 
 .df_folder .df_item.df_selected .df_label{
@@ -403,6 +421,8 @@ window decoration{
     background: rgba(0,0,255,0);
 }
 
+
+
 .df_note_text text{
     background:rgba(0,0,0,0);
 }

diff --git a/meson.build b/meson.build
@@ -44,6 +44,8 @@ src = [
        'src/utils/dragndrop/DndView.vala',
        'src/utils/dragndrop/DndBehaviour.vala',
        'src/utils/RenameDialog.vala',
+       'src/utils/animation/GtkAnimation.vala',
+       'src/utils/animation/Fx.vala',
        'src/utils/EditableLabel.vala',
        'src/widgets/DesktopWindow.vala',
        'src/widgets/FolderWindow.vala',
@@ -61,7 +63,16 @@ src = [
        'src/logic/NoteManager.vala',
        'src/logic/PhotoManager.vala',
        'src/dialogs/ProgressDialog.vala',
-       'src/dialogs/PanelPropertiesWindow.vala'
+       'src/dialogs/PanelPropertiesWindow.vala',
+       'src/logic/folderarrangement/FolderArrangement.vala',
+       'src/logic/folderarrangement/FolderArrangementFree.vala',
+       'src/logic/folderarrangement/FolderArrangementGrid.vala',
+       'src/logic/folderarrangement/FolderArrangementManaged.vala',
+       'src/logic/folderarrangement/FolderSort.vala',
+       'src/logic/folderarrangement/FolderSortByName.vala',
+       'src/logic/folderarrangement/FolderSortBySize.vala',
+       'src/logic/folderarrangement/FolderSortByType.vala',
+       'src/logic/folderarrangement/FolderGrid.vala'
       ]
 
 exename = get_option('exename')