diff --git a/debian/changelog b/debian/changelog index 7347918..c787729 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Sun, 12 Nov 2023 19:28:36 -0600 diff --git a/debian/patches/add-manual.patch b/debian/patches/add-manual.patch index 9955c22..5044bb2 100644 --- a/debian/patches/add-manual.patch +++ b/debian/patches/add-manual.patch @@ -3,156 +3,6 @@ Forwarded: eventually Author: Simon Quigley Last-Update: 2022-06-16 --- ---- a/pcmanfm/desktop-preferences.ui -+++ b/pcmanfm/desktop-preferences.ui -@@ -6,8 +6,8 @@ - - 0 - 0 -- 534 -- 434 -+ 609 -+ 720 - - - -@@ -485,27 +485,17 @@ are left clicked, even when it is not th - false - - -- -- -- -- Wallpaper image folder: -+ -+ -+ -+ Wallpaper folder - - - -- -- -+ -+ - -- Browse -- -- -- -- -- -- -- hour(s) -- -- -- 24 -+ Randomize the slide show - - - -@@ -522,6 +512,20 @@ are left clicked, even when it is not th - - - -+ -+ -+ -+ Wallpaper image folder: -+ -+ -+ -+ -+ -+ -+ Browse -+ -+ -+ - - - -@@ -545,46 +549,42 @@ are left clicked, even when it is not th - - - -- -- -+ -+ - - Qt::Horizontal - -+ -+ QSizePolicy::Minimum -+ - - -- 10 -+ 5 - 5 - - - - -- -- -- -- Wallpaper folder -- -- -- -- -- -+ -+ - - Qt::Horizontal - -- -- QSizePolicy::Minimum -- - - -- 5 -+ 10 - 5 - - - - -- -- -- -- Randomize the slide show -+ -+ -+ -+ hour(s) -+ -+ -+ 24 - - - -@@ -663,6 +663,17 @@ are left clicked, even when it is not th - .. - - -+ -+ -+ -+ -+ Lubuntu Manual -+ -+ -+ -+ .. -+ -+ - - - --- 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 + + + ++ ++ ++ ++ Lubuntu Manual ++ ++ ++ ++ .. ++ ++ ++ + + +