Lubuntu/pcmanfm-qt-packaging
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put the Lubuntu Manual checkbox where it belongs.

Browse Source
This commit is contained in:
Aaron Rainbolt 2023-03-02 17:42:22 -06:00
parent 7d655d511a
commit 59c245310b
2 changed files with 154 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
pcmanfm-qt (1.2.1-0ubuntu2) lunar; urgency=medium
* Put the Lubuntu Manual checkbox where it belongs in the Desktop
Preferences window. (LP: #1998528)
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Thu, 02 Mar 2023 17:41:45 -0600
pcmanfm-qt (1.2.1-0ubuntu1) lunar; urgency=medium
* New upstream release.

163
debian/patches/add-manual.patch vendored
View File

@ -3,14 +3,152 @@ Forwarded: eventually
Author: Simon Quigley <tsimonq2@lubuntu.me>
Last-Update: 2022-06-16
---
diff --git a/pcmanfm/desktop-preferences.ui b/pcmanfm/desktop-preferences.ui
index d73e731..459926a 100644
--- a/pcmanfm/desktop-preferences.ui
+++ b/pcmanfm/desktop-preferences.ui
@@ -573,6 +573,17 @@ are left clicked, even when it is not the default file manager.</string>
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>534</width>
- <height>434</height>
+ <width>609</width>
+ <height>720</height>
</rect>
</property>
<property name="windowTitle">
@@ -17,7 +17,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
- <number>0</number>
+ <number>3</number>
</property>
<widget class="QWidget" name="generalPage">
<attribute name="title">
@@ -485,27 +485,17 @@ are left clicked, even when it is not th
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_4">
- <item row="0" column="0" colspan="7">
- <widget class="QLabel" name="label_10">
- <property name="text">
- <string>Wallpaper image folder:</string>
+ <item row="1" column="0" colspan="6">
+ <widget class="QLineEdit" name="imageFolder">
+ <property name="placeholderText">
+ <string>Wallpaper folder</string>
</property>
</widget>
</item>
- <item row="1" column="6">
- <widget class="QPushButton" name="folderBrowse">
+ <item row="3" column="0" colspan="6">
+ <widget class="QCheckBox" name="randomize">
<property name="text">
- <string>Browse</string>
- </property>
- </widget>
- </item>
- <item row="2" column="2">
- <widget class="QSpinBox" name="hours">
- <property name="suffix">
- <string> hour(s)</string>
- </property>
- <property name="maximum">
- <number>24</number>
+ <string>Randomize the slide show</string>
</property>
</widget>
</item>
@@ -522,6 +512,20 @@ are left clicked, even when it is not th
</property>
</widget>
</item>
+ <item row="0" column="0" colspan="7">
+ <widget class="QLabel" name="label_10">
+ <property name="text">
+ <string>Wallpaper image folder:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="6">
+ <widget class="QPushButton" name="folderBrowse">
+ <property name="text">
+ <string>Browse</string>
+ </property>
+ </widget>
+ </item>
<item row="2" column="0">
<widget class="QLabel" name="label_11">
<property name="toolTip">
@@ -545,46 +549,42 @@ are left clicked, even when it is not th
</property>
</widget>
</item>
- <item row="2" column="5">
- <spacer name="horizontalSpacer_2">
+ <item row="2" column="1">
+ <spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Minimum</enum>
+ </property>
<property name="sizeHint" stdset="0">
<size>
- <width>10</width>
+ <width>5</width>
<height>5</height>
</size>
</property>
</spacer>
</item>
- <item row="1" column="0" colspan="6">
- <widget class="QLineEdit" name="imageFolder">
- <property name="placeholderText">
- <string>Wallpaper folder</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <spacer name="horizontalSpacer_3">
+ <item row="2" column="5">
+ <spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType">
- <enum>QSizePolicy::Minimum</enum>
- </property>
<property name="sizeHint" stdset="0">
<size>
- <width>5</width>
+ <width>10</width>
<height>5</height>
</size>
</property>
</spacer>
</item>
- <item row="3" column="0" colspan="6">
- <widget class="QCheckBox" name="randomize">
- <property name="text">
- <string>Randomize the slide show</string>
+ <item row="2" column="2">
+ <widget class="QSpinBox" name="hours">
+ <property name="suffix">
+ <string> hour(s)</string>
+ </property>
+ <property name="maximum">
+ <number>24</number>
</property>
</widget>
</item>
@@ -663,6 +663,17 @@ are left clicked, even when it is not th
<normaloff>.</normaloff>.</iconset>
</property>
</widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="lubuntuManualBox">
+ <property name="text">
@ -21,15 +159,12 @@ index d73e731..459926a 100644
+ <normaloff>.</normaloff>.</iconset>
+ </property>
+ </widget>
+ </item>
</item>
</layout>
</widget>
</item>
diff --git a/pcmanfm/desktoppreferencesdialog.cpp b/pcmanfm/desktoppreferencesdialog.cpp
index 87fcfc2..a691d0c 100644
--- a/pcmanfm/desktoppreferencesdialog.cpp
+++ b/pcmanfm/desktoppreferencesdialog.cpp
@@ -204,6 +204,9 @@ void DesktopPreferencesDialog::applySettings()
@@ -208,6 +208,9 @@ void DesktopPreferencesDialog::applySett
if(ui.networkBox->isChecked()) {
ds << QLatin1String("Network");
}
@ -39,11 +174,9 @@ index 87fcfc2..a691d0c 100644
settings.setDesktopShortcuts(ds);
settings.setDesktopCellMargins(QSize(ui.hMargin->value(), ui.vMargin->value()));
diff --git a/pcmanfm/desktopwindow.cpp b/pcmanfm/desktopwindow.cpp
index 78e8d2f..3edb7f0 100644
--- a/pcmanfm/desktopwindow.cpp
+++ b/pcmanfm/desktopwindow.cpp
@@ -276,6 +276,16 @@ void DesktopWindow::updateShortcutsFromSettings(Settings& settings) {
@@ -277,6 +277,16 @@ void DesktopWindow::updateShortcutsFromS
paths.push_back(Fm::FilePath::fromLocalPath(network.toStdString().c_str()));
}
}
@ -60,7 +193,7 @@ index 78e8d2f..3edb7f0 100644
// WARNING: QFile::remove() is not compatible with libfm-qt and should not be used.
if(!paths.empty()) {
@@ -361,6 +371,20 @@ void DesktopWindow::createNetworkShortcut() {
@@ -362,6 +372,20 @@ void DesktopWindow::createNetworkShortcu
g_key_file_free(kf);
}
@ -81,7 +214,7 @@ index 78e8d2f..3edb7f0 100644
void DesktopWindow::createTrash() {
if(trashMonitor_) {
return;
@@ -1260,7 +1284,8 @@ void DesktopWindow::trustOurDesktopShortcut(std::shared_ptr<const Fm::FileInfo>
@@ -1297,7 +1321,8 @@ void DesktopWindow::trustOurDesktopShort
const char* execStr = isHome ? homeExec.get() :
fileName == QLatin1String("trash-can.desktop") && ds.contains(QLatin1String("Trash")) ? "pcmanfm-qt trash:///" :
fileName == QLatin1String("computer.desktop") && ds.contains(QLatin1String("Computer")) ? "pcmanfm-qt computer:///" :
@ -91,11 +224,9 @@ index 78e8d2f..3edb7f0 100644
if(execStr) {
GKeyFile* kf = g_key_file_new();
if(g_key_file_load_from_file(kf, file->path().toString().get(), G_KEY_FILE_NONE, nullptr)) {
diff --git a/pcmanfm/desktopwindow.h b/pcmanfm/desktopwindow.h
index 742d964..4a90cb4 100644
--- a/pcmanfm/desktopwindow.h
+++ b/pcmanfm/desktopwindow.h
@@ -155,6 +155,7 @@ private:
@@ -158,6 +158,7 @@ private:
void createHomeShortcut();
void createComputerShortcut();
void createNetworkShortcut();