diff --git a/debian/changelog b/debian/changelog index bb6c98c..123daff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ pcmanfm-qt (2.2.0-0ubuntu1) questing; urgency=medium * New upstream release. - Update build dependencies. + - Refresh Lubuntu Manual patch. * Update copyright file. * Bump Standards-Version to 4.7.2, no changes needed. diff --git a/debian/patches/add-manual.patch b/debian/patches/add-manual.patch index 9781022..ff8f595 100644 --- a/debian/patches/add-manual.patch +++ b/debian/patches/add-manual.patch @@ -5,15 +5,15 @@ Last-Update: 2023-12-01 --- --- a/pcmanfm/desktoppreferencesdialog.cpp +++ b/pcmanfm/desktoppreferencesdialog.cpp -@@ -120,6 +120,7 @@ DesktopPreferencesDialog::DesktopPrefere +@@ -124,6 +124,7 @@ DesktopPreferencesDialog::DesktopPrefere ui.trashBox->setChecked(ds.contains(QLatin1String("Trash"))); ui.computerBox->setChecked(ds.contains(QLatin1String("Computer"))); ui.networkBox->setChecked(ds.contains(QLatin1String("Network"))); + ui.lubuntuManualBox->setChecked(ds.contains(QLatin1String("Lubuntu Manual"))); - connect(ui.buttonBox->button(QDialogButtonBox::Apply), &QPushButton::clicked, - this, &DesktopPreferencesDialog::onApplyClicked); -@@ -208,6 +209,9 @@ void DesktopPreferencesDialog::applySett + // set fallback icon here (cannot be done in .ui) + ui.networkBox->setIcon(QIcon::fromTheme(QStringLiteral("network"), QIcon::fromTheme(QStringLiteral("folder-network")))); +@@ -215,6 +216,9 @@ void DesktopPreferencesDialog::applySett if(ui.networkBox->isChecked()) { ds << QLatin1String("Network"); } @@ -25,7 +25,7 @@ Last-Update: 2023-12-01 settings.setDesktopCellMargins(QSize(ui.hMargin->value(), ui.vMargin->value())); --- a/pcmanfm/desktopwindow.cpp +++ b/pcmanfm/desktopwindow.cpp -@@ -280,6 +280,16 @@ void DesktopWindow::updateShortcutsFromS +@@ -310,6 +310,16 @@ void DesktopWindow::updateShortcutsFromS paths.push_back(Fm::FilePath::fromLocalPath(network.toStdString().c_str())); } } @@ -42,7 +42,7 @@ Last-Update: 2023-12-01 // WARNING: QFile::remove() is not compatible with libfm-qt and should not be used. if(!paths.empty()) { -@@ -365,6 +375,20 @@ void DesktopWindow::createNetworkShortcu +@@ -395,6 +405,20 @@ void DesktopWindow::createNetworkShortcu g_key_file_free(kf); } @@ -63,7 +63,7 @@ Last-Update: 2023-12-01 void DesktopWindow::createTrash() { if(trashMonitor_) { return; -@@ -1005,7 +1029,8 @@ void DesktopWindow::onFileClicked(int ty +@@ -1046,7 +1070,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"))) @@ -73,7 +73,7 @@ Last-Update: 2023-12-01 QMenu* menu = new QMenu(this); // "Open" action for all QAction* action = menu->addAction(tr("Open")); -@@ -1314,7 +1339,8 @@ void DesktopWindow::trustOurDesktopShort +@@ -1380,7 +1405,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:///" : @@ -85,7 +85,7 @@ Last-Update: 2023-12-01 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 -@@ -160,6 +160,7 @@ private: +@@ -164,6 +164,7 @@ private: void createHomeShortcut(); void createComputerShortcut(); void createNetworkShortcut(); @@ -95,7 +95,7 @@ Last-Update: 2023-12-01 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 +@@ -660,6 +660,17 @@ are left clicked, even when it is not th