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

Update Lubuntu Manual patch. Needs testing.

Browse Source
backport/jammy
Simon Quigley 1 year ago
parent 733cda357d
commit e21dde4311
2 changed files with 26 additions and 155 deletions
Show Stats Download Patch File Download Diff File

1
debian/changelog vendored
Unescape View File

@ -2,6 +2,7 @@ pcmanfm-qt (1.4.0-0ubuntu1) UNRELEASED; urgency=medium
* New upstream release.
* Bump build dependencies.
* Update Lubuntu Manual patch. Needs testing.
-- Simon Quigley <tsimonq2@ubuntu.com> Sun, 12 Nov 2023 19:28:36 -0600

180
debian/patches/add-manual.patch vendored
Unescape View File

@ -3,156 +3,6 @@ Forwarded: eventually
Author: Simon Quigley <tsimonq2@lubuntu.me>
Last-Update: 2022-06-16
---
--- a/pcmanfm/desktop-preferences.ui
+++ b/pcmanfm/desktop-preferences.ui
@@ -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">
@@ -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">
+ <string>Lubuntu Manual</string>
+ </property>
+ <property name="icon">
+ <iconset theme="help-browser">
+ <normaloff>.</normaloff>.</iconset>
+ </property>
+ </widget>
</item>
</layout>
</widget>
--- a/pcmanfm/desktoppreferencesdialog.cpp
+++ b/pcmanfm/desktoppreferencesdialog.cpp
@@ -120,6 +120,7 @@ DesktopPreferencesDialog::DesktopPrefere
@ -175,7 +25,7 @@ Last-Update: 2022-06-16
settings.setDesktopCellMargins(QSize(ui.hMargin->value(), ui.vMargin->value()));
--- a/pcmanfm/desktopwindow.cpp
+++ b/pcmanfm/desktopwindow.cpp
@@ -277,6 +277,16 @@ void DesktopWindow::updateShortcutsFromS
@@ -280,6 +280,16 @@ void DesktopWindow::updateShortcutsFromS
paths.push_back(Fm::FilePath::fromLocalPath(network.toStdString().c_str()));
}
}
@ -192,7 +42,7 @@ Last-Update: 2022-06-16
// WARNING: QFile::remove() is not compatible with libfm-qt and should not be used.
if(!paths.empty()) {
@@ -362,6 +372,20 @@ void DesktopWindow::createNetworkShortcu
@@ -365,6 +375,20 @@ void DesktopWindow::createNetworkShortcu
g_key_file_free(kf);
}
@ -213,7 +63,7 @@ Last-Update: 2022-06-16
void DesktopWindow::createTrash() {
if(trashMonitor_) {
return;
@@ -987,7 +1011,8 @@ void DesktopWindow::onFileClicked(int ty
@@ -1005,7 +1029,8 @@ void DesktopWindow::onFileClicked(int ty
if((fileName == QLatin1String("trash-can.desktop") && ds.contains(QLatin1String("Trash")))
|| (fileName == QLatin1String("user-home.desktop") && ds.contains(QLatin1String("Home")))
|| (fileName == QLatin1String("computer.desktop") && ds.contains(QLatin1String("Computer")))
@ -223,7 +73,7 @@ Last-Update: 2022-06-16
QMenu* menu = new QMenu(this);
// "Open" action for all
QAction* action = menu->addAction(tr("Open"));
@@ -1297,7 +1322,8 @@ void DesktopWindow::trustOurDesktopShort
@@ -1314,7 +1339,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:///" :
@ -235,7 +85,7 @@ Last-Update: 2022-06-16
if(g_key_file_load_from_file(kf, file->path().toString().get(), G_KEY_FILE_NONE, nullptr)) {
--- a/pcmanfm/desktopwindow.h
+++ b/pcmanfm/desktopwindow.h
@@ -158,6 +158,7 @@ private:
@@ -160,6 +160,7 @@ private:
void createHomeShortcut();
void createComputerShortcut();
void createNetworkShortcut();
@ -243,3 +93,23 @@ Last-Update: 2022-06-16
void createTrash();
static void onTrashChanged(GFileMonitor* monitor, GFile* gf, GFile* other, GFileMonitorEvent evt, DesktopWindow* pThis);
--- a/pcmanfm/desktop-preferences.ui
+++ b/pcmanfm/desktop-preferences.ui
@@ -664,6 +664,17 @@ are left clicked, even when it is not th
</property>
</widget>
</item>
+ <item>
+ <widget class="QCheckBox" name="lubuntuManualBox">
+ <property name="text">
+ <string>Lubuntu Manual</string>
+ </property>
+ <property name="icon">
+ <iconset theme="help-browser">
+ <normaloff>.</normaloff>.</iconset>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>

Write Preview
Loading…
Cancel
Save