morgan/dash-to-panel
1
0
Fork 0
mirror of https://github.com/morgan9e/dash-to-panel synced 2026-04-14 00:04:17 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/home-sweet-gnome/dash-to-panel into beautify

Browse Source
This commit is contained in:
Hirnmoder
2025-01-27 07:14:00 +01:00
parent c3fc8fa4ee 4d61b95c83
commit f1585fb3bc
6 changed files with 20 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
extension.js
View File

@@ -33,7 +33,6 @@ const UBUNTU_DOCK_UUID = 'ubuntu-dock@ubuntu.com';
let panelManager; let panelManager;
let extensionChangedHandler; let extensionChangedHandler;
let startupCompleteHandler; let startupCompleteHandler;
let disabledUbuntuDock;
let extensionSystem = Main.extensionManager; let extensionSystem = Main.extensionManager;
export let DTP_EXTENSION = null; export let DTP_EXTENSION = null;
@@ -81,12 +80,6 @@ export default class DashToPanelExtension extends Extension {
if (!reset) { if (!reset) {
extensionSystem.disconnect(extensionChangedHandler); extensionSystem.disconnect(extensionChangedHandler);
if (disabledUbuntuDock) {
disabledUbuntuDock = false;
extensionSystem.enableExtension(UBUNTU_DOCK_UUID);
}
delete global.dashToPanel; delete global.dashToPanel;
AppIcons.resetRecentlyClickedApp(); AppIcons.resetRecentlyClickedApp();
@@ -104,13 +97,11 @@ export default class DashToPanelExtension extends Extension {
function _enable(extension) { function _enable(extension) {
let enabled = global.settings.get_strv('enabled-extensions'); let enabled = global.settings.get_strv('enabled-extensions');
if (enabled?.indexOf(UBUNTU_DOCK_UUID) >= 0) { if (enabled?.indexOf(UBUNTU_DOCK_UUID) >= 0)
disabledUbuntuDock = true;
extensionSystem.disableExtension(UBUNTU_DOCK_UUID); extensionSystem.disableExtension(UBUNTU_DOCK_UUID);
}
if (panelManager) if (panelManager)
return panelManager.toggleDash(); // already initialized but ubuntu dock restored the original dash on disable return
SETTINGS = extension.getSettings('org.gnome.shell.extensions.dash-to-panel'); SETTINGS = extension.getSettings('org.gnome.shell.extensions.dash-to-panel');
DESKTOPSETTINGS = new Gio.Settings({schema_id: 'org.gnome.desktop.interface'}); DESKTOPSETTINGS = new Gio.Settings({schema_id: 'org.gnome.desktop.interface'});

4
panelManager.js
View File

@@ -296,10 +296,6 @@ export const PanelManager = class {
this._desktopIconsUsableArea = null; this._desktopIconsUsableArea = null;
} }
toggleDash() {
this.overview.toggleDash();
}
_setDesktopIconsMargins() { _setDesktopIconsMargins() {
this._desktopIconsUsableArea?.resetMargins(); this._desktopIconsUsableArea?.resetMargins();
this.allPanels.forEach(p => { this.allPanels.forEach(p => {

4
ui/BoxWindowPreviewOptions.ui
View File

@@ -322,7 +322,7 @@
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="active">True</property> <property name="active">True</property>
<signal name="toggled" handler="preview_title_position_bottom_button_toggled_cb" swapped="no"/> <signal name="toggled" handler="preview_title_position_bottom_button_toggled_cb"/>
</object> </object>
</child> </child>
<child> <child>
@@ -331,7 +331,7 @@
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="group">preview_title_position_bottom_button</property> <property name="group">preview_title_position_bottom_button</property>
<signal name="toggled" handler="preview_title_position_top_button_toggled_cb" swapped="no"/> <signal name="toggled" handler="preview_title_position_top_button_toggled_cb"/>
</object> </object>
</child> </child>
</object> </object>

10
ui/SettingsFineTune.ui
View File

@@ -58,7 +58,7 @@
<property name="digits">0</property> <property name="digits">0</property>
<property name="value_pos">right</property> <property name="value_pos">right</property>
<property name="draw_value">True</property> <property name="draw_value">True</property>
<signal name="value-changed" handler="tray_size_scale_value_changed_cb" swapped="no"/> <signal name="value-changed" handler="tray_size_scale_value_changed_cb"/>
</object> </object>
</child> </child>
</object> </object>
@@ -76,7 +76,7 @@
<property name="digits">0</property> <property name="digits">0</property>
<property name="value_pos">right</property> <property name="value_pos">right</property>
<property name="draw_value">True</property> <property name="draw_value">True</property>
<signal name="value-changed" handler="leftbox_size_scale_value_changed_cb" swapped="no"/> <signal name="value-changed" handler="leftbox_size_scale_value_changed_cb"/>
</object> </object>
</child> </child>
</object> </object>
@@ -102,7 +102,7 @@
<property name="digits">0</property> <property name="digits">0</property>
<property name="value_pos">right</property> <property name="value_pos">right</property>
<property name="draw_value">True</property> <property name="draw_value">True</property>
<signal name="value-changed" handler="tray_padding_scale_value_changed_cb" swapped="no"/> <signal name="value-changed" handler="tray_padding_scale_value_changed_cb"/>
</object> </object>
</child> </child>
</object> </object>
@@ -120,7 +120,7 @@
<property name="digits">0</property> <property name="digits">0</property>
<property name="value_pos">right</property> <property name="value_pos">right</property>
<property name="draw_value">True</property> <property name="draw_value">True</property>
<signal name="value-changed" handler="statusicon_padding_scale_value_changed_cb" swapped="no"/> <signal name="value-changed" handler="statusicon_padding_scale_value_changed_cb"/>
</object> </object>
</child> </child>
</object> </object>
@@ -138,7 +138,7 @@
<property name="digits">0</property> <property name="digits">0</property>
<property name="value_pos">right</property> <property name="value_pos">right</property>
<property name="draw_value">True</property> <property name="draw_value">True</property>
<signal name="value-changed" handler="leftbox_padding_scale_value_changed_cb" swapped="no"/> <signal name="value-changed" handler="leftbox_padding_scale_value_changed_cb"/>
</object> </object>
</child> </child>
</object> </object>

10
ui/SettingsPosition.ui
View File

@@ -131,7 +131,7 @@
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="active">True</property> <property name="active">True</property>
<signal name="clicked" handler="position_bottom_button_clicked_cb" swapped="no"/> <signal name="clicked" handler="position_bottom_button_clicked_cb"/>
</object> </object>
</child> </child>
<child> <child>
@@ -140,7 +140,7 @@
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="group">position_bottom_button</property> <property name="group">position_bottom_button</property>
<signal name="clicked" handler="position_top_button_clicked_cb" swapped="no"/> <signal name="clicked" handler="position_top_button_clicked_cb"/>
</object> </object>
</child> </child>
<child> <child>
@@ -149,7 +149,7 @@
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="group">position_bottom_button</property> <property name="group">position_bottom_button</property>
<signal name="clicked" handler="position_left_button_clicked_cb" swapped="no"/> <signal name="clicked" handler="position_left_button_clicked_cb"/>
</object> </object>
</child> </child>
<child> <child>
@@ -158,7 +158,7 @@
<property name="receives_default">False</property> <property name="receives_default">False</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="group">position_bottom_button</property> <property name="group">position_bottom_button</property>
<signal name="clicked" handler="position_right_button_clicked_cb" swapped="no"/> <signal name="clicked" handler="position_right_button_clicked_cb"/>
</object> </object>
</child> </child>
</object> </object>
@@ -176,7 +176,7 @@
<property name="digits">0</property> <property name="digits">0</property>
<property name="value_pos">right</property> <property name="value_pos">right</property>
<property name="draw_value">True</property> <property name="draw_value">True</property>
<signal name="value-changed" handler="panel_size_scale_value_changed_cb" swapped="no"/> <signal name="value-changed" handler="panel_size_scale_value_changed_cb"/>
</object> </object>
</child> </child>
</object> </object>

12
ui/SettingsStyle.ui
View File

@@ -69,7 +69,7 @@
<property name="digits">0</property> <property name="digits">0</property>
<property name="value_pos">right</property> <property name="value_pos">right</property>
<property name="draw_value">True</property> <property name="draw_value">True</property>
<signal name="value-changed" handler="appicon_margin_scale_value_changed_cb" swapped="no"/> <signal name="value-changed" handler="appicon_margin_scale_value_changed_cb"/>
</object> </object>
</child> </child>
</object> </object>
@@ -123,7 +123,7 @@
<property name="digits">0</property> <property name="digits">0</property>
<property name="value_pos">right</property> <property name="value_pos">right</property>
<property name="draw_value">True</property> <property name="draw_value">True</property>
<signal name="value-changed" handler="appicon_padding_scale_value_changed_cb" swapped="no"/> <signal name="value-changed" handler="appicon_padding_scale_value_changed_cb"/>
</object> </object>
</child> </child>
</object> </object>
@@ -208,7 +208,7 @@
<object class="GtkToggleButton" id="dots_bottom_button"> <object class="GtkToggleButton" id="dots_bottom_button">
<property name="label" translatable="yes">Bottom</property> <property name="label" translatable="yes">Bottom</property>
<property name="valign">center</property> <property name="valign">center</property>
<signal name="toggled" handler="dots_bottom_button_toggled_cb" swapped="no"/> <signal name="toggled" handler="dots_bottom_button_toggled_cb"/>
</object> </object>
</child> </child>
<child> <child>
@@ -216,7 +216,7 @@
<property name="label" translatable="yes">Top</property> <property name="label" translatable="yes">Top</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="group">dots_bottom_button</property> <property name="group">dots_bottom_button</property>
<signal name="toggled" handler="dots_top_button_toggled_cb" swapped="no"/> <signal name="toggled" handler="dots_top_button_toggled_cb"/>
</object> </object>
</child> </child>
<child> <child>
@@ -224,7 +224,7 @@
<property name="label" translatable="yes">Left</property> <property name="label" translatable="yes">Left</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="group">dots_bottom_button</property> <property name="group">dots_bottom_button</property>
<signal name="toggled" handler="dots_left_button_toggled_cb" swapped="no"/> <signal name="toggled" handler="dots_left_button_toggled_cb"/>
</object> </object>
</child> </child>
<child> <child>
@@ -232,7 +232,7 @@
<property name="label" translatable="yes">Right</property> <property name="label" translatable="yes">Right</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="group">dots_bottom_button</property> <property name="group">dots_bottom_button</property>
<signal name="toggled" handler="dots_right_button_toggled_cb" swapped="no"/> <signal name="toggled" handler="dots_right_button_toggled_cb"/>
</object> </object>
</child> </child>
</object> </object>