Merge branch 'xfce-without-docklike' into dev

Hayao0819 · Hayao0819 · commit 664e8321063a · 2021-04-01T14:56:40.000+09:00
diff --git a/channels/serene/packages_aur.i686/xfce.i686 b/channels/serene/packages_aur.i686/xfce.i686
@@ -11,4 +11,4 @@
 
 #-- plugin --#
 #xfce4-calculator-plugin
-xfce4-docklike-plugin-git
+#xfce4-docklike-plugin-git
diff --git a/channels/serene/packages_aur.x86_64/xfce.x86_64 b/channels/serene/packages_aur.x86_64/xfce.x86_64
@@ -11,4 +11,4 @@
 
 #-- plugin --#
 #xfce4-calculator-plugin
-xfce4-docklike-plugin-git
+#xfce4-docklike-plugin-git
diff --git a/channels/xfce-pro/airootfs.any/etc/dconf/db/local.d/01-alter-plank b/channels/xfce-pro/airootfs.any/etc/dconf/db/local.d/01-alter-plank
@@ -0,0 +1,21 @@
+[net/launchpad/plank/docks/dock1]
+alignment='center'
+auto-pinning=true
+current-workspace-only=false
+dock-items=['chromium.dockitem', 'thunar.dockitem', 'libreoffice-startcenter.dockitem', 'thunderbird.dockitem', 'vlc.dockitem', 'medit.dockitem', 'xfce4-screenshooter.dockitem', 'xfce4-terminal.dockitem', 'xfce-settings-manager.dockitem']
+hide-delay=0
+hide-mode='intelligent'
+icon-size=32
+items-alignment='center'
+lock-items=false
+monitor=''
+offset=0
+pinned-only=false
+position='bottom'
+pressure-reveal=false
+show-dock-item=false
+theme='Transparent'
+tooltips-enabled=true
+unhide-delay=0
+zoom-enabled=false
+zoom-percent=150
diff --git a/channels/xfce-pro/airootfs.any/etc/skel/.config/autostart/Plank.desktop b/channels/xfce-pro/airootfs.any/etc/skel/.config/autostart/Plank.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=0.9.4
+Type=Application
+Name=Plank
+Comment=Elegant, simple, clean dock
+Exec=/usr/bin/plank
+RunHook=0
+StartupNotify=false
+Terminal=false
+Hidden=false
+GenericName=Start Plank dock launcher
+Icon=dock
diff --git a/channels/xfce-pro/airootfs.any/etc/skel/.config/plank/dock1/launchers/chromium.dockitem b/channels/xfce-pro/airootfs.any/etc/skel/.config/plank/dock1/launchers/chromium.dockitem
@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/chromium.desktop
diff --git a/channels/xfce-pro/airootfs.any/etc/skel/.config/plank/dock1/launchers/libreoffice-startcenter.dockitem b/channels/xfce-pro/airootfs.any/etc/skel/.config/plank/dock1/launchers/libreoffice-startcenter.dockitem
@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/libreoffice-startcenter.desktop
diff --git a/channels/xfce-pro/airootfs.any/etc/skel/.config/plank/dock1/launchers/medit.dockitem b/channels/xfce-pro/airootfs.any/etc/skel/.config/plank/dock1/launchers/medit.dockitem
@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/medit.desktop
diff --git a/channels/xfce-pro/airootfs.any/etc/skel/.config/plank/dock1/launchers/thunar.dockitem b/channels/xfce-pro/airootfs.any/etc/skel/.config/plank/dock1/launchers/thunar.dockitem
@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/thunar.desktop
diff --git a/channels/xfce-pro/airootfs.any/etc/skel/.config/plank/dock1/launchers/thunderbird.dockitem b/channels/xfce-pro/airootfs.any/etc/skel/.config/plank/dock1/launchers/thunderbird.dockitem
@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/thunderbird.desktop
diff --git a/channels/xfce-pro/airootfs.any/etc/skel/.config/plank/dock1/launchers/vlc.dockitem b/channels/xfce-pro/airootfs.any/etc/skel/.config/plank/dock1/launchers/vlc.dockitem
@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/vlc.desktop
diff --git a/channels/xfce-pro/airootfs.any/etc/skel/.config/plank/dock1/launchers/xfce-settings-manager.dockitem b/channels/xfce-pro/airootfs.any/etc/skel/.config/plank/dock1/launchers/xfce-settings-manager.dockitem
@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/xfce-settings-manager.desktop
diff --git a/channels/xfce-pro/airootfs.any/etc/skel/.config/plank/dock1/launchers/xfce4-screenshooter.dockitem b/channels/xfce-pro/airootfs.any/etc/skel/.config/plank/dock1/launchers/xfce4-screenshooter.dockitem
@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/xfce4-screenshooter.desktop
diff --git a/channels/xfce-pro/airootfs.any/etc/skel/.config/plank/dock1/launchers/xfce4-terminal.dockitem b/channels/xfce-pro/airootfs.any/etc/skel/.config/plank/dock1/launchers/xfce4-terminal.dockitem
@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/xfce4-terminal.desktop
diff --git a/channels/xfce-pro/airootfs.any/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/channels/xfce-pro/airootfs.any/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -3,31 +3,9 @@
 <channel name="xfce4-panel" version="1.0">
   <property name="configver" type="int" value="2"/>
   <property name="panels" type="array">
-    <value type="int" value="1"/>
     <value type="int" value="2"/>
     <value type="int" value="3"/>
     <value type="int" value="4"/>
-    <value type="int" value="5"/>
-    <value type="int" value="6"/>
-    <property name="panel-1" type="empty">
-      <property name="position" type="string" value="p=10;x=970;y=953"/>
-      <property name="size" type="uint" value="40"/>
-      <property name="length" type="uint" value="5"/>
-      <property name="position-locked" type="bool" value="true"/>
-      <property name="plugin-ids" type="array">
-        <value type="int" value="2"/>
-      </property>
-      <property name="autohide-behavior" type="uint" value="1"/>
-      <property name="background-style" type="uint" value="1"/>
-      <property name="background-rgba" type="array">
-        <value type="double" value="0.000000"/>
-        <value type="double" value="0.000000"/>
-        <value type="double" value="0.000000"/>
-        <value type="double" value="1.000000"/>
-      </property>
-      <property name="enter-opacity" type="uint" value="75"/>
-      <property name="leave-opacity" type="uint" value="75"/>
-    </property>
     <property name="panel-2" type="empty">
       <property name="position" type="string" value="p=6;x=64;y=25"/>
       <property name="size" type="uint" value="35"/>
@@ -91,41 +69,8 @@
       <property name="enter-opacity" type="uint" value="100"/>
       <property name="leave-opacity" type="uint" value="100"/>
     </property>
-    <property name="panel-5" type="empty">
-      <property name="position" type="string" value="p=8;x=98;y=949"/>
-      <property name="size" type="uint" value="40"/>
-      <property name="length" type="uint" value="20"/>
-      <property name="position-locked" type="bool" value="true"/>
-      <property name="enter-opacity" type="uint" value="0"/>
-      <property name="leave-opacity" type="uint" value="0"/>
-      <property name="background-style" type="uint" value="1"/>
-      <property name="background-rgba" type="array">
-        <value type="double" value="0.750000"/>
-        <value type="double" value="0.250000"/>
-        <value type="double" value="0.250000"/>
-        <value type="double" value="0.000000"/>
-      </property>
-      <property name="autohide-behavior" type="uint" value="1"/>
-    </property>
-    <property name="panel-6" type="empty">
-      <property name="position" type="string" value="p=4;x=1824;y=949"/>
-      <property name="size" type="uint" value="40"/>
-      <property name="length" type="uint" value="20"/>
-      <property name="position-locked" type="bool" value="true"/>
-      <property name="background-style" type="uint" value="1"/>
-      <property name="background-rgba" type="array">
-        <value type="double" value="0.750000"/>
-        <value type="double" value="0.250000"/>
-        <value type="double" value="0.250000"/>
-        <value type="double" value="0.000000"/>
-      </property>
-      <property name="autohide-behavior" type="uint" value="1"/>
-      <property name="enter-opacity" type="uint" value="0"/>
-      <property name="leave-opacity" type="uint" value="0"/>
-    </property>
   </property>
   <property name="plugins" type="empty">
-    <property name="plugin-2" type="string" value="docklike"/>
     <property name="plugin-3" type="string" value="whiskermenu"/>
     <property name="plugin-11" type="string" value="separator">
       <property name="expand" type="bool" value="true"/>
diff --git a/channels/xfce-pro/packages.x86_64/plank.x86_64 b/channels/xfce-pro/packages.x86_64/plank.x86_64
@@ -0,0 +1,11 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+plank
diff --git a/channels/xfce-pro/packages_aur.x86_64/xfce.x86_64 b/channels/xfce-pro/packages_aur.x86_64/xfce.x86_64
@@ -14,4 +14,4 @@ compiz
 
 #-- plugin --#
 #xfce4-calculator-plugin
-xfce4-docklike-plugin-git
+#xfce4-docklike-plugin-git
diff --git a/channels/xfce/airootfs.any/etc/dconf/db/local.d/01-alter-plank b/channels/xfce/airootfs.any/etc/dconf/db/local.d/01-alter-plank
@@ -0,0 +1,21 @@
+[net/launchpad/plank/docks/dock1]
+alignment='center'
+auto-pinning=true
+current-workspace-only=false
+dock-items=['chromium.dockitem', 'thunar.dockitem', 'libreoffice-startcenter.dockitem', 'thunderbird.dockitem', 'vlc.dockitem', 'medit.dockitem', 'xfce4-screenshooter.dockitem', 'xfce4-terminal.dockitem', 'xfce-settings-manager.dockitem']
+hide-delay=0
+hide-mode='intelligent'
+icon-size=32
+items-alignment='center'
+lock-items=false
+monitor=''
+offset=0
+pinned-only=false
+position='bottom'
+pressure-reveal=false
+show-dock-item=false
+theme='Transparent'
+tooltips-enabled=true
+unhide-delay=0
+zoom-enabled=false
+zoom-percent=150
diff --git a/channels/xfce/airootfs.any/etc/skel/.config/autostart/Plank.desktop b/channels/xfce/airootfs.any/etc/skel/.config/autostart/Plank.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=0.9.4
+Type=Application
+Name=Plank
+Comment=Elegant, simple, clean dock
+Exec=/usr/bin/plank
+RunHook=0
+StartupNotify=false
+Terminal=false
+Hidden=false
+GenericName=Start Plank dock launcher
+Icon=dock
diff --git a/channels/xfce/airootfs.any/etc/skel/.config/plank/dock1/launchers/chromium.dockitem b/channels/xfce/airootfs.any/etc/skel/.config/plank/dock1/launchers/chromium.dockitem
@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/chromium.desktop
diff --git a/channels/xfce/airootfs.any/etc/skel/.config/plank/dock1/launchers/libreoffice-startcenter.dockitem b/channels/xfce/airootfs.any/etc/skel/.config/plank/dock1/launchers/libreoffice-startcenter.dockitem
@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/libreoffice-startcenter.desktop
diff --git a/channels/xfce/airootfs.any/etc/skel/.config/plank/dock1/launchers/medit.dockitem b/channels/xfce/airootfs.any/etc/skel/.config/plank/dock1/launchers/medit.dockitem
@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/medit.desktop
diff --git a/channels/xfce/airootfs.any/etc/skel/.config/plank/dock1/launchers/thunar.dockitem b/channels/xfce/airootfs.any/etc/skel/.config/plank/dock1/launchers/thunar.dockitem
@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/thunar.desktop
diff --git a/channels/xfce/airootfs.any/etc/skel/.config/plank/dock1/launchers/thunderbird.dockitem b/channels/xfce/airootfs.any/etc/skel/.config/plank/dock1/launchers/thunderbird.dockitem
@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/thunderbird.desktop
diff --git a/channels/xfce/airootfs.any/etc/skel/.config/plank/dock1/launchers/vlc.dockitem b/channels/xfce/airootfs.any/etc/skel/.config/plank/dock1/launchers/vlc.dockitem
@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/vlc.desktop
diff --git a/channels/xfce/airootfs.any/etc/skel/.config/plank/dock1/launchers/xfce-settings-manager.dockitem b/channels/xfce/airootfs.any/etc/skel/.config/plank/dock1/launchers/xfce-settings-manager.dockitem
@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/xfce-settings-manager.desktop
diff --git a/channels/xfce/airootfs.any/etc/skel/.config/plank/dock1/launchers/xfce4-screenshooter.dockitem b/channels/xfce/airootfs.any/etc/skel/.config/plank/dock1/launchers/xfce4-screenshooter.dockitem
@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/xfce4-screenshooter.desktop
diff --git a/channels/xfce/airootfs.any/etc/skel/.config/plank/dock1/launchers/xfce4-terminal.dockitem b/channels/xfce/airootfs.any/etc/skel/.config/plank/dock1/launchers/xfce4-terminal.dockitem
@@ -0,0 +1,2 @@
+[PlankDockItemPreferences]
+Launcher=file:///usr/share/applications/xfce4-terminal.desktop
diff --git a/channels/xfce/airootfs.any/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/channels/xfce/airootfs.any/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -3,31 +3,9 @@
 <channel name="xfce4-panel" version="1.0">
   <property name="configver" type="int" value="2"/>
   <property name="panels" type="array">
-    <value type="int" value="1"/>
     <value type="int" value="2"/>
     <value type="int" value="3"/>
     <value type="int" value="4"/>
-    <value type="int" value="5"/>
-    <value type="int" value="6"/>
-    <property name="panel-1" type="empty">
-      <property name="position" type="string" value="p=10;x=970;y=953"/>
-      <property name="size" type="uint" value="40"/>
-      <property name="length" type="uint" value="5"/>
-      <property name="position-locked" type="bool" value="true"/>
-      <property name="plugin-ids" type="array">
-        <value type="int" value="2"/>
-      </property>
-      <property name="autohide-behavior" type="uint" value="1"/>
-      <property name="background-style" type="uint" value="1"/>
-      <property name="background-rgba" type="array">
-        <value type="double" value="0.000000"/>
-        <value type="double" value="0.000000"/>
-        <value type="double" value="0.000000"/>
-        <value type="double" value="1.000000"/>
-      </property>
-      <property name="enter-opacity" type="uint" value="75"/>
-      <property name="leave-opacity" type="uint" value="75"/>
-    </property>
     <property name="panel-2" type="empty">
       <property name="position" type="string" value="p=6;x=64;y=25"/>
       <property name="size" type="uint" value="35"/>
@@ -91,41 +69,8 @@
       <property name="enter-opacity" type="uint" value="100"/>
       <property name="leave-opacity" type="uint" value="100"/>
     </property>
-    <property name="panel-5" type="empty">
-      <property name="position" type="string" value="p=8;x=98;y=949"/>
-      <property name="size" type="uint" value="40"/>
-      <property name="length" type="uint" value="20"/>
-      <property name="position-locked" type="bool" value="true"/>
-      <property name="enter-opacity" type="uint" value="0"/>
-      <property name="leave-opacity" type="uint" value="0"/>
-      <property name="background-style" type="uint" value="1"/>
-      <property name="background-rgba" type="array">
-        <value type="double" value="0.750000"/>
-        <value type="double" value="0.250000"/>
-        <value type="double" value="0.250000"/>
-        <value type="double" value="0.000000"/>
-      </property>
-      <property name="autohide-behavior" type="uint" value="1"/>
-    </property>
-    <property name="panel-6" type="empty">
-      <property name="position" type="string" value="p=4;x=1824;y=949"/>
-      <property name="size" type="uint" value="40"/>
-      <property name="length" type="uint" value="20"/>
-      <property name="position-locked" type="bool" value="true"/>
-      <property name="background-style" type="uint" value="1"/>
-      <property name="background-rgba" type="array">
-        <value type="double" value="0.750000"/>
-        <value type="double" value="0.250000"/>
-        <value type="double" value="0.250000"/>
-        <value type="double" value="0.000000"/>
-      </property>
-      <property name="autohide-behavior" type="uint" value="1"/>
-      <property name="enter-opacity" type="uint" value="0"/>
-      <property name="leave-opacity" type="uint" value="0"/>
-    </property>
   </property>
   <property name="plugins" type="empty">
-    <property name="plugin-2" type="string" value="docklike"/>
     <property name="plugin-3" type="string" value="whiskermenu"/>
     <property name="plugin-11" type="string" value="separator">
       <property name="expand" type="bool" value="true"/>
diff --git a/channels/xfce/packages.i686/plank.i686 b/channels/xfce/packages.i686/plank.i686
@@ -0,0 +1,11 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+plank
diff --git a/channels/xfce/packages.x86_64/plank.x86_64 b/channels/xfce/packages.x86_64/plank.x86_64
@@ -0,0 +1,11 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+plank
diff --git a/channels/xfce/packages_aur.i686/xfce.i686 b/channels/xfce/packages_aur.i686/xfce.i686
@@ -9,4 +9,4 @@
 #
 
 #xfce4-calculator-plugin
-xfce4-docklike-plugin-git
+#xfce4-docklike-plugin-git
diff --git a/channels/xfce/packages_aur.x86_64/xfce.x86_64 b/channels/xfce/packages_aur.x86_64/xfce.x86_64
@@ -9,4 +9,4 @@
 #
 
 #xfce4-calculator-plugin
-xfce4-docklike-plugin-git
+#xfce4-docklike-plugin-git

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[PlankDockItemPreferences]`
	`2`	`+Launcher=file:///usr/share/applications/chromium.desktop`