- BugFix: Increased width of Terminal tab labels on optionsdialog.

- BugFix: Removed a debug msg when octopi was not being executed with "-
d".

.gitignore

@@ -1,9 +1,26 @@
+*.user
+.qmake.stash
+.qtc_clangd/**
 Makefile
 bin/**
 build/**
+helper/*.o
+helper/moc*.*
+helper/octphelper
 cachecleaner/bin/**
 cachecleaner/build/**
+cachecleaner/.qtc_clangd/**
 notifier/bin/**
 notifier/build/**
-qrc_resources.cpp
+notifier/.qtc_clangd/**
 octopi.pro.user
+qrc_resources.cpp
+repoeditor/.qtc_clangd/**
+repoeditor/bin/**
+repoeditor/build/**
+sudo/*.o
+sudo/moc*.*
+sudo/octopi-sudo
+sudo/qrc*.cpp
+sudo/ui_pass*.h
+sudo/.qtc_clangd

.tx/config

@@ -1,8 +1,11 @@
 [main]
 host = https://www.transifex.com
 
-[octopi.octopi]
-file_filter = resources/translations/octopi_<lang>.ts
-source_file = resources/translations/octopi_en.ts
-source_lang = en
-type = QT
+[o:arnt:p:octopi:r:octopi]
+file_filter            = resources/translations/octopi_<lang>.ts
+source_file            = resources/translations/octopi_en.ts
+source_lang            = en
+type                   = QT
+replace_edited_strings = false
+keep_translations      = false
+

CHANGELOG

@@ -1,4 +1,181 @@
-0.9.0
+0.16.2 (2024-06-17)
+  BugFix: Increased width of Terminal tab labels on optionsdialog.
+  BugFix: Removed a debug msg when octopi was not being executed with "-d".
+  Updated translations.
+
+0.16.1 (2024-06-09)
+  BugFix: Updated some LANG environment variables to C.UTF-8.
+  BugFix: Info/Files tabs were always empty if they were selected at octopi's start.
+  BugFix: Do not install notifier's desktop file in /etc/xdg/autostart.
+  BugFix: Could not remove packages when internet connection was down (thanks to Theluga).
+  Added shortcut key "Ctrl+Shift+U" to upgrade outdated AUR packages.
+  Arrow keys navegation refresh Info and Files tabs again.
+  Updated translations.
+  
+0.16.0 (2024-05-19)
+  BugFix: '--noeditmenu' is deprecated. Use '--editmenu=false' instead (thanks to rbaruccojr).
+  BugFix: Fixed silent error when pacman's database is locked (thanks to  SloppyPuppy).
+  BugFix: Files tab expand all items by default.
+  BugFix: Updated translations.
+  Now using the unified qt-sudo project (https://github.com/aarnt/qt-sudo) for privilege escalation.
+  Default to Qt6 lib build (including qtermwidget6)
+ 
+0.15.0 (2023-09-10)
+  BugFix: Invalidate Info/Files tabs when user is navigating packages using the keyboard.
+  BugFix: Better handle dependencies while staging packages for deletion.
+  BugFix: First yay-bin download now works again.
+  BugFix: Polished navigation on Info tab dependencies
+  BugFix: AUR passwords that contained a "+" char failed to login at aur.archlinux.org.
+  BugFix: When using the pacman backend, call "pacman -Qm" to fetch ALL foreign packages.
+  BugFix: Change install reason did not work with pacman backend.
+  Made the code Qt5/Qt6 compatible.
+  Using "pacman -Fl" to view contents of non installed packages (thanks to Zesko).
+  Added a Terminal tab to options dialog to config its colors and fonts.
+  Octopi-sudo code was synced to match project "lxqt-sudo" version 1.3.0.
+
+0.14.0 (2022-10-05)
+  Added --overwrite="*" checkbox in AUR tab (Tools/Options) when using yay.
+  Octopi-sudo code was synced to match project "lxqt-sudo" version 1.1.0.
+  BugFix: Package search did not work correctly when query string contained a "+" sign.
+  BugFix: Info/Files tab refresh was duplicated.
+  BugFix: Disable (another try) Info/Files tab refresh while typing in Filter/Search 
+    line edit.
+
+0.13.0 (2022-03-30)
+  BugFix: editFile() caused a crash while in Mate desktop. Both "Open PKGBUILD" 
+    and "Show PKGBUILD diff" options were affected.
+  BugFix: removed stylesheet from treeviews. It makes dark themes look better
+    (thanks to buckmelanoma).
+  BugFix: Pressing ENTER over an installed AUR pkg no longer sends it to the 
+    install action treeview. 
+  BugFix: Made Octopi compatible with aurweb 6.x version (view PKGBUILD,
+    diff PKGBUILD, vote, unvote and list voted AUR).
+  Added "Outdated" filter/option on menu "View".
+  Added a "-checkupdates" parameter to Notifier, so users can update the status
+    of an already running Octopi Notifier.
+  Added option to update selected outdated AUR pkgs directly from the main list.
+ 
+0.12.0 (2021-11-06)
+  Added support for pacman 6.0 (thanks to class101)
+  Added support for Paru AUR tool.
+  Added support for opendoas tool (default).
+  Added support for Archcraft OS.
+  Added support for Garuda Linux distro.
+  Added support for Obarun Linux distro.
+  Actions tab shows a counter feedback for inserts (with a plus signal) and 
+    removals (with a minus signal) and does not steal focus anymore.
+  Octopi-sudo code was synced to match project "lxqt-sudo" version 1.0.0.
+  BugFix: Initial database searches are executed after main interface is shown. 
+    This improves UI feedback on older cpus.
+  BugFix: If there was only 1 result in AUR search, the pkg could not enter 
+    the transaction with the right name.
+  BugFix: IgnorePkg pkgs are shown as outdated when using ALPM backend.
+  BugFix: If user went from AUR to normal search with a not found pkg the statusbar
+    counters would become invisible.
+  BugFix: If options dialog was called while both notifier and octopi were running,
+    Updates tab was not shown.
+
+0.11.0 (2021-01-11)
+  Added support for CMake build system (thanks to Tereius).
+  Added support to build multiple foreign packages at once (they are first copied 
+	to the Actions' tree view just like official packages).
+  Added "Open PKGBUILD" option to open the AUR PKGBUILD file in a text editor.
+  Added "Show PKGBUILD diff" option to show the differences between latest and previous
+	PKGBUILD files of the selected AUR package in a text editor.
+  Added "Install Date" at Info tab.
+  Added "Licenses", "Maintainer", "Depends On", "Make Deps", "Last Modified" and "Out-of-date" 
+	fields at Info tab while in AUR mode.
+  Added option to display "Licenses", "Installed Size", "Build Date", "Install Date" and
+	"Install Reason" columns in the package list.
+  Added option to "Change Install Reason" of selected packages (Explicitly <-> As Dependency).
+  Added a faster refresh package list code after checking for updates.
+  Added "Build directory" option in AUR tab on options dialog, so users can change where
+	makepkg builds the source code.
+  Added support for '^' and '$' chars in AUR search
+  Added "Open news in a browser" option on right clicking the News tab.
+  Optional package dependencies are now installed with "--asdeps" parameter.
+  Octopi-sudo code was synced to match project "lxqt-sudo" version 0.16.0.
+  Updated PKGBUILD file following MatMoul's suggestion.
+  Removed unused speedup service.
+  Prevent users from running Octopi, Notifier and Cache Cleaner outside "/usr/bin" dir.
+  BugFix: Disable Info/Files tab refresh while typing in filter/search line edit.
+  BugFix: unset TMPDIR environment variable on every Octo tool startup 
+	(to avoid "octopi-helper[aborted]: Couldn't attach to memory" errors).
+  BugFix: "total download size" showed the value 0 in Notifier if the database was not synched.
+  BugFix: Pressing ESC in repoeditor could ask if you wanted to save your changes even
+	if there were no changes made.
+  BugFix: Running Notifier within a DE session could lead to a "Suspicious execution method" error.
+  BugFix: If you tried to execute octopi after upgrading your system with notifier you got a
+	notifier crash and an octopi freeze (thanks to linuxer for pointing that out).
+  BugFix: Prevent icon changes in notifier when there were transaction errors.
+  BugFix: The list of targets to install were not showing ok in the transaction dialog.
+  BugFix: Restored support for command line parameters like "-sysupgrade-noconfirm" and "-style".
+  BugFix: Updated "-help" output text.
+  BugFix: Tab navigation improvements.
+  BugFix: Statusbar showed a number of packages when the list was empty (the previous value).
+  BugFix: Clicking on printed outdated packages in Output tab did not send to corresponding 
+	package in the main list after a 'Check updates'.
+  BugFix: WM detection now uses "ps -aux".
+
+0.10.0 (2020-07-19)
+  Added a built-in default priviledge escalation tool: "octopi-sudo" as a slightly modified version 
+	of "lxqt-sudo" project (version 0.15.0). It's the only escalation tool supported!
+  Added option to vote/unvote for AUR packages using aur.archlinux.org login.
+  Added "pikaur" AUR tool support (thanks to ewilly).
+  Added "yay" AUR tool support.
+  Added option "--devel" in AUR tab to check for newer versions of dev packages.
+  Added option to download a temporary yay-bin to enable AUR.
+  Updated some UI icons and added an specific one for foreign non installed pkg.
+  Dropped support for external terminal applications. QTermWidget is mandatory now!
+  Print ".pacnew" file list summary after upgrade (if any).
+  Added Lumina desktop support.
+  RepoEditor now saves window size and position.
+  Added "copy" command to octopi's embedded terminal context menu.
+  Added option to enable/disable confirmation dialog in system upgrade.
+  Added option to enable/disable internet checking.
+  Renamed Transaction tab to Actions tab.
+  Added left click support on package icon in package list to launch context menu.
+  Added option to never check for package updates in Notifier.
+  Added tooltip "Upgrading..." while Notifier is upgrading the system.
+  Added "Info" option in package list context menu.
+  Added ArcoLinux, Artix Linux, CondresOS and EndeavourOS distro support.
+  Added support for sudo (and NOPASSWD) executing thru new octopi-helper subproject.
+  Added option to exit Octopi while a transaction is already running.
+  Added support for GNOME file manager/editor.
+  Added option for changing use of alternating row colors in package list.
+  Added a redesigned AUR tab in Options dialog.
+  Added option to change terminal's color scheme, font family and font size through ~/.config/octopi/octopi.conf.
+  Maximization of properties pane now hides tab bar.
+  BugFix: Many clazy/manual code enhancements merged from luis-pereira (from LXQt organization).
+  BugFix: AUR upgrades in notifier were not setting m_commandExecuting flag.
+  BugFix: Make notifier code consistent with AUR upgrades.
+  BugFix: Replaced 'Sync database' command text to 'Check updates'.
+  BugFix: Always do a "pacman -Syu" in System Upgrade.
+  BugFix: Notifier now uses "checkupdates" instead "pacman -Sy[y]". This means Octopi no longer can lead 
+	the OS to a "partial updates" state and works gracefully with other package tools.
+  BugFix: Don't let user exits RepoEditor without answerig if he wants to save changes.
+  BugFix: Sometimes non-outdated AUR packages did not get refreshed.
+  BugFix: Now Actions tab is disable while in AUR mode.
+  BugFix: Make "Open terminal here" option work with qtermwidget.
+  BugFix: Added support for symbolic lynks in "open file".
+  BugFix: Pkg build date obeys Locale datetime format.
+  BugFix: SysInfo no longer pushes the collected logs to a remote paste service. It saves them locally.
+  BugFix: "exists in filesystem" messages during transactions are shown again.
+  BugFix: MultiselectionDialog did not resize pkg description automatically.
+  BugFix: Some packages were not displaying Optional Deps at Info tab.
+  BugFix: Huge delay when scrolling thru large package list.
+  BugFix: Speed improvements in package list building.
+  BugFix: OptionsDialog was not saving AUR settings if tab changed before clicking OK.
+  BugFix: Changed Manjaro news url.
+  BugFix: Notifier checked for available internet connection too early with an error dialog box.
+  BugFix: Changed command string to Reinstall/Update when package is already installed or outdated.
+  BugFix: Clear filter line edit when navigating thru package anchors at Info tab.
+  BugFix: Info and Files tabs were not showing any info automaticaly when switching between 
+	foreign tool/pacman lists.
+  BugFix: Enable a more complete UI lockdown during transactions.
+  BugFix: Enable "Find a file" context menu option on a non installed pkg.
+
+0.9.0 (2018-06-08)
   Parser changes: added counter for processed packages.  
   Group pane now spans all window's height.
   SysInfo now uses ptpb site and does not block interface.
@@ -54,7 +231,7 @@
   BugFix: Disable alien icon while in transaction.
   BugFix: Do not ask twice for password if a pacman lck file exists.
 
-0.8.1
+0.8.1 (2016-03-27)
   BugFix: Updated CHAKRA RSS site (thanks to s8321414).
   BugFix: Distro news now works with https KaOS site.
   BugFix: Files tab was not refreshing when enabling KCP mode in KaOS.
@@ -77,7 +254,7 @@
   Added support for lxqt-sudo tool (thanks to Manjaro team).
   Added "pkgfile -u" (if available) in sync db transaction.
 
-0.8.0
+0.8.0 (2015-11-08)
   This is a Qt5 only version (with the exception of 'octopi-notifier').
   BugFix: Speed optimizations in startup code (AUR outdated list).
   BugFix: Octopi now honors the $SHELL variable (thanks to LAC1213).
@@ -108,7 +285,7 @@
   Help/About dialog now shows Pacman information.
   StatusBar msg got updated with number of selected packages more visible.  
 
-0.7.0
+0.7.0 (2015-04-27)
   Major speed fix: Faster pkg list building.
   Reverted to showing ALL packages at startup.
   Added a systemd service to speed up the very first octopi startup time.
@@ -138,7 +315,7 @@
   BugFix: If user had no gksu/kdesu/root when clicking "clean" button in 
 	cachecleaner, cursor would remain waiting (thanks to imperator-).
 
-0.6.0
+0.6.0 (2015-02-27)
   BugFix: Pkg list was being refreshed twice sometimes.
   BugFix: Removed some buggy strings from Output tab while in KF5.
   BugFix: ArrowUp/Down, PageUp/Down and Home/End keys now refresh Package Info tab.
@@ -166,7 +343,7 @@
   Refactorings in SearchLineEdit.
   BugFixes in RepoEditor translation support (repoeditor is now in Transifex too).
 
-0.5.0
+0.5.0 (2014-11-08)
   BugFix: RepoEditor would not compile with Qt5 lib (thanks to Philm).
   BugFix: Suppress GConf error strings in output.
   BugFix: mate-terminal is returning code 255 even when execution of 
@@ -192,14 +369,14 @@
   Added support for KStatusNotifier while in KDE (thanks to brcha).
   Updated translations.
 
-0.4.2
+0.4.2 (2014-07-26)
   BugFix: when searching AUR pkgs, given search string was not being matched 
 	by package descriptions.
   BugFix: Sometimes got a gconf bug string at sync db.
   Updated a bunch of translations.
   Added support for the new kcp tool (Go version).
 
-0.4.1
+0.4.1 (2014-07-12)
   Added basque translation (thanks to tarteka).
   Added es_AR translation (thanks to javier).
   Added japanese translation (thanks to UTUMI Hirosi - utuhiro78).
@@ -227,7 +404,7 @@
   Added Search by file feature (pacman -Qo).
   Added a string validator in the search edit widget.
 
-0.4.0
+0.4.0 (2014-05-24)
   Huge refactorings in model/view that brings consistent memory and 
 	speed improvements - a single model and a central data storage (thanks to 
 	Thomas Binkau - tbinkau).
@@ -281,7 +458,7 @@
   Fixed getBuildDate code to always convert dates to english format.
   Updated some translations.
 
-0.3.2
+0.3.2 (2014-02-14)
   Cleaned unused code.
   Added icon for mirror-check while in KaOS.
   Does a mirror-check at startup while in KaOS.
@@ -296,7 +473,7 @@
   BugFix: When the user had no yaourt in the system, there were a zombie 
 	octopi process 'left running'.
 
-0.3.1
+0.3.1 (2014-01-14)
   Added support for Qt5.
   Added chinese (Taiwan), malay, slovak and ukrainian translations.
   Added support to KaOS, a lean KDE centric Linux distro.
@@ -307,7 +484,7 @@
 	first searches into transaction queue for them.
   BugFix: Prevent header resizing in File and Transaction tabs.
 
-0.3
+0.3.0 (2013-11-03) 
   Code cleanings.
   BugFix: No need to refresh package list after a cache clean.
   BugFix: Konsole was not working with yaourt package installation.
@@ -354,7 +531,7 @@
   Added an About Dialog to Octopi Notifier.
   Updated translations.
 
-0.2
+0.2.0 (2013-08-24)
   Splitted the project in "octopi" and "octopi-notifier".
   Yaourt no longer runs with root permissions.
   Added support for package multi selection in Yaourt mode.
@@ -375,23 +552,23 @@
   IgnorePkg option is now used to build outdated package list.
   BugFix: Empty pkg descriptions are now shown as empty.
 
-0.1.9.1
+0.1.9.1 (2013-07-14)
   Important bugfixes to deal with multithreaded code.
   Added a "globals.h/.cpp" file to group QFutureWatcher globals.
   Updated style changing code in main.cpp.
   BugFix: when user cancelled a sysupgrade transaction inside a 
 terminal, the package actions remained disabled.
 
-0.1.9
+0.1.9 (2013-07-09)
   Added yaourt support.
   Updated most of the translations.
 
-0.1.8
+0.1.8 (2013-06-16)
   Added czech translation.
   Added support to ArchBang Linux.
   Added a systemtray icon notifier feature using DBus technology.
 
-0.1.7.3
+0.1.7.3 (2013-05-26)
   Added a TRANSLATIONS file.
   Added danish translation.
   Added indonesian translation.
@@ -401,14 +578,14 @@ terminal, the package actions remained disabled.
   Bugfix: sysupgrade must refresh packagelist after syncdatabase.
   Bugfix: if sysupgrade uses SyncFirst, makes it automatically start a second upgrade.
 
-0.1.7.2
+0.1.7.2 (2013-05-17)
   Added catalan translation.
   Bugfix: updated new binary translation files to the resources.
 
-0.1.7.1
+0.1.7.1 (2013-05-11)
   Bugfix: menu icons were not being shown while in Xfce.
 
-0.1.7
+0.1.7 (2013-05-11)
   Added "-sysupgrade" command line option.
   Added "-removecmd" command line option.
   Added lots of translations.
@@ -416,11 +593,11 @@ terminal, the package actions remained disabled.
   Added an About dialog.
   Changed the old About tab to Usage tab.
 
-0.1.6.1
+0.1.6.1 (2013-04-25)
   Added pt_BR translation.
   Added "Open root terminal" option in File menu.
 
-0.1.6
+0.1.6 (2013-04-12)
   Added a new Transaction Dialog.
   Added a Firefox-like search inside Files, News and About tabs.
   Added support for Chakra.
@@ -428,33 +605,33 @@ terminal, the package actions remained disabled.
   Added option to execute any transaction inside a terminal.
   Changed ProgressDialog to a progressBar at the screen bottom.
   
-0.1.5
+0.1.5 (2013-04-06)
   Added option to search packages by description and name.
   Added support for pacman version 4.1.
   Transactions with conflict errors can be re-executed inside a terminal.
   Reworked Manjaro Linux theme.
 
-0.1.4.1
+0.1.4.1 (2013-03-30)
   Bugfix release
   Added total download size information in transaction dialog.
 
-0.1.4
+0.1.4 (2013-03-28)
   Added a Manjaro Linux theme.
   Changed position of filter line edit to the toolbar.
 
-0.1.3
+0.1.3 (2013-03-19)
   Added better support to Qt dark themes.
   Added context menu support inside Files tab.
   Made URLs clickable inside Output tab.
   Fixed the annoying Packager information display bug.
 
-0.1.2
+0.1.2 (2013-03-18)
   Tons of refactorings and bugfixes.
   Small changes in UI.
 
-0.1.1 
+0.1.1 (2013-03-17)
   Added all six tabs.
   Added support for groups of packages.
 
-0.1.0 
+0.1.0 (2013-03-11)
   Initial Proof of Concept release.

CMakeLists.txt

@@ -0,0 +1,130 @@
+cmake_minimum_required(VERSION 3.5)
+project(octopi VERSION 0.16.2 LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_THREAD_PREFER_PTHREAD True)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
+
+option(USE_QTERMWIDGET6 "Build with qtermwidget6 instead of qtermwidget5" ON)
+
+add_subdirectory(helper)
+add_subdirectory(notifier)
+add_subdirectory(cachecleaner)
+add_subdirectory(repoeditor)
+
+if (USE_QTERMWIDGET6)
+  find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat Gui Network Xml Widgets LinguistTools)
+  find_package(qtermwidget6 REQUIRED)
+else()
+  find_package(Qt5 REQUIRED COMPONENTS Core Gui Network Xml Widgets LinguistTools)
+  find_package(qtermwidget5 REQUIRED)
+endif()
+
+find_package(alpm_octopi_utils REQUIRED)
+
+set(CMAKE_AUTOMOC ON)
+
+file(GLOB TS_FILES LIST_DIRECTORIES false "${CMAKE_CURRENT_LIST_DIR}/resources/translations/*.ts")
+qt_add_translation(qmFiles ${TS_FILES})
+
+set(src
+    src/QtSolutions/qtsingleapplication.cpp
+    src/QtSolutions/qtlocalpeer.cpp
+    repoeditor/repoentry.cpp
+    src/aurvote.cpp
+    src/propertiestabwidget.cpp
+    src/qaesencryption.cpp
+    src/repoconf.cpp
+    src/main.cpp
+    src/mainwindow.cpp
+    src/strconstants.cpp
+    src/searchlineedit.cpp
+    src/argumentlist.cpp
+    src/settingsmanager.cpp
+    src/package.cpp
+    src/unixcommand.cpp
+    src/wmhelper.cpp
+    src/treeviewpackagesitemdelegate.cpp
+    src/mainwindow_init.cpp
+    src/mainwindow_transaction.cpp
+    src/mainwindow_events.cpp
+    src/mainwindow_help.cpp
+    src/searchbar.cpp
+    src/mainwindow_searchbar.cpp
+    src/transactiondialog.cpp
+    src/mainwindow_news.cpp
+    src/mainwindow_refresh.cpp
+    src/globals.cpp
+    src/multiselectiondialog.cpp
+    src/packagerepository.cpp
+    src/model/packagemodel.cpp
+    src/ui/octopitabinfo.cpp
+    src/utils.cpp
+    src/terminal.cpp
+    src/pacmanexec.cpp
+    src/optionsdialog.cpp
+    src/packagetreeview.cpp
+    src/termwidget.cpp
+    src/alpmbackend.cpp)
+
+set(header
+    src/QtSolutions/qtsingleapplication.h
+    src/QtSolutions/qtlocalpeer.h
+    repoeditor/repoentry.h
+    src/aurvote.h
+    src/propertiestabwidget.h
+    src/qaesencryption.h
+    src/repoconf.h
+    src/mainwindow.h
+    src/strconstants.h
+    src/searchlineedit.h
+    src/argumentlist.h
+    src/settingsmanager.h
+    src/uihelper.h
+    src/package.h
+    src/unixcommand.h
+    src/wmhelper.h
+    src/treeviewpackagesitemdelegate.h
+    src/searchbar.h
+    src/transactiondialog.h
+    src/globals.h
+    src/multiselectiondialog.h
+    src/packagerepository.h
+    src/model/packagemodel.h
+    src/ui/octopitabinfo.h
+    src/utils.h
+    src/terminal.h
+    src/pacmanexec.h
+    src/constants.h
+    src/optionsdialog.h
+    src/packagetreeview.h
+    src/termwidget.h
+    src/alpmbackend.h)
+
+set(ui ui/mainwindow.ui ui/transactiondialog.ui ui/multiselectiondialog.ui ui/optionsdialog.ui)
+
+set(qrc resources.qrc)
+
+qt_wrap_ui(src ${ui})
+qt_add_resources(src ${qrc})
+
+add_executable(octopi ${src} ${header} ${qmFiles})
+target_compile_definitions(octopi PRIVATE OCTOPI_EXTENSIONS ALPM_BACKEND QT_DEPRECATED_WARNINGS QT_USE_QSTRINGBUILDER QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII QT_NO_URL_CAST_FROM_STRING QT_NO_CAST_FROM_BYTEARRAY)
+
+if (USE_QTERMWIDGET6)
+  target_include_directories(octopi PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${Qt6Core_INCLUDE_DIRS} ${Qt6Gui_INCLUDE_DIRS} ${Qt6Network_INCLUDE_DIRS} ${Qt6Xml_INCLUDE_DIRS} ${Qt6Widgets_INCLUDE_DIRS})
+  target_link_libraries(octopi PRIVATE Qt6::Core Qt6::Gui Qt6::Network Qt6::Xml Qt6::Widgets qtermwidget6 alpm_octopi_utils)
+else()
+  target_include_directories(octopi PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Xml_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS})
+  target_link_libraries(octopi PRIVATE Qt5::Core Qt5::Gui Qt5::Network Qt5::Xml Qt5::Widgets qtermwidget5 alpm_octopi_utils)
+endif()
+
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/resources/images/octopi_green.png" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+file(RENAME "${CMAKE_CURRENT_BINARY_DIR}/octopi_green.png" "${CMAKE_CURRENT_BINARY_DIR}/octopi.png")
+install(TARGETS octopi RUNTIME DESTINATION bin LIBRARY DESTINATION lib PUBLIC_HEADER DESTINATION include)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/octopi.desktop" DESTINATION share/applications)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/octopi.png" "${CMAKE_CURRENT_SOURCE_DIR}/resources/images/octopi_green.png" DESTINATION share/icons/gnome/32x32/apps)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/octopi.png" "${CMAKE_CURRENT_SOURCE_DIR}/resources/images/octopi_green.png"
+        "${CMAKE_CURRENT_SOURCE_DIR}/resources/images/octopi_red.png" "${CMAKE_CURRENT_SOURCE_DIR}/resources/images/octopi_yellow.png" DESTINATION share/icons)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE" DESTINATION share/licenses/octopi)

INSTALL

@@ -1,6 +1,6 @@
 Installing Octopi is a pretty straightforward task. 
 
-Assuming you have updated Qt4(*) libs installed in your system, all 
+Assuming you have updated Qt5 libs installed in your system, all
 you have to do is run:
 
 	makepkg -f
@@ -8,21 +8,10 @@ you have to do is run:
 Wait for the compilation and then install the generated package (as 
 root), using:
 
-	pacman -U [--force] <nameOfTheGeneratedOctopiPackage.tar.xz>
+        pacman -U <nameOfTheGeneratedOctopiPackage.tar.[xz|zst]>
 
-You can also install the generated package notifier, using:
-
-	pacman -U [--force] <nameOfTheGeneratedOctopiNotifierPackage.tar.xz>
-
-Octopi is located at the system utilities menu of your Desktop 
+Octopi is located on the system utilities menu of your Desktop
 Environment.
 
 
 Enjoy!
-
-(*) Octopi is also Qt5 compatible, you'll only have to adjust the 
-"depends" section in PKGBUILD.
-
-If you are compiling Octopi in a KDE centric-distro like KaOS and Chakra, you should 
-first uncomment the "#define NO_GTK_STYLE" string located at "src/main.cpp" and 
-"notifier/octopi-notifier/main.cpp", otherwise it won't compile at all.

PKGBUILD

@@ -1,71 +1,53 @@
-pkgname=octopi
-pkgver=0.9.0
+_pkgname=octopi
+pkgname=octopi-git
+pkgver=0.16.2.latest
 pkgrel=1
-pkgdesc="This is Octopi, a powerful Pacman frontend using Qt libs"
-url="https://octopiproject.wordpress.com/"
+pkgdesc="This is Octopi, a powerful Pacman frontend using Qt libs (git checkout)"
+url="https://tintaescura.com/projects/octopi/"
 arch=('i686' 'x86_64')
 license=('GPL2')
-depends=('pacman' 'pacman-contrib' 'pkgfile' 'knotifications' 'alpm_octopi_utils' 'xterm' 'qtermwidget')
-optdepends=('kdesu: for KDE'
-            'gksu: for XFCE, Gnome, LXDE, Cinnamon'
-            'gnome-keyring: for password management'
-            'yaourt: for AUR support')
+depends=('alpm_octopi_utils' 'qtermwidget' 'sudo')
+makedepends=('git')
 groups=('system')
-install=octopi.install
-source=("https://github.com/aarnt/octopi/archive/v${pkgver}.tar.gz")
-#md5sums=('')
+source=("git+https://github.com/aarnt/octopi.git")
+md5sums=('SKIP')
 
 prepare() {
-   cd ${pkgname}-${pkgver}
-
-   # enable the kstatus switch, disable if you wish to build without Plasma/knotifications support
-   sed -e "s|DEFINES += ALPM_BACKEND #KSTATUS|DEFINES += ALPM_BACKEND KSTATUS|" -i notifier/octopi-notifier/octopi-notifier.pro
-      
+   cd "${_pkgname}"
    cp resources/images/octopi_green.png resources/images/octopi.png
 }
-         
+
+pkgver() {
+   cd "${_pkgname}"
+   git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
+}
+
 build() {
-   cd ${pkgname}-${pkgver}
-   
-   qmake-qt5 octopi.pro
-   make
-   
-   cd notifier/pacmanhelper
-   qmake-qt5 QMAKE_CFLAGS_RELEASE="${CFLAGS}" QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" QMAKE_LFLAGS_RELEASE="${LDFLAGS}" pacmanhelper.pro
-   make
-   cd ../..
-   
-   cd notifier/octopi-notifier
-   qmake-qt5 QMAKE_CFLAGS_RELEASE="${CFLAGS}" QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" QMAKE_LFLAGS_RELEASE="${LDFLAGS}" octopi-notifier.pro
-   make
-   cd ../..
-   
-   cd repoeditor
-   qmake-qt5 QMAKE_CFLAGS_RELEASE="${CFLAGS}" QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" QMAKE_LFLAGS_RELEASE="${LDFLAGS}" octopi-repoeditor.pro
-   make
-   cd ..
-   
-   cd cachecleaner
-   qmake-qt5 QMAKE_CFLAGS_RELEASE="${CFLAGS}" QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS}" QMAKE_LFLAGS_RELEASE="${LDFLAGS}" octopi-cachecleaner.pro
+   cd "${_pkgname}"
+   echo "Starting build..."   
+   qmake6 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" octopi.pro
    make
+
+   _subdirs="cachecleaner helper notifier repoeditor"
+
+   for _subdir in $_subdirs; do
+     pushd $_subdir
+     echo "Building octopi-$_subdir..."
+     qmake6 PREFIX=/usr QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" "octopi-$_subdir.pro"
+     make
+     popd
+   done  
 }
 
 package() {
-   cd ${pkgname}-${pkgver}
-   make INSTALL_ROOT=${pkgdir} install
-   
-   cd notifier/pacmanhelper
-   make INSTALL_ROOT=${pkgdir} install
-   cd ../..
-   
-   cd notifier/octopi-notifier
-   make INSTALL_ROOT=${pkgdir} install
-   cd ../..
-   
-   cd repoeditor
-   make INSTALL_ROOT=${pkgdir} install
-   cd ..
-   
-   cd cachecleaner
-   make INSTALL_ROOT=${pkgdir} install
+   cd "${_pkgname}"
+   make INSTALL_ROOT="${pkgdir}" install
+
+   _subdirs="cachecleaner helper notifier repoeditor"
+
+   for _subdir in $_subdirs; do
+     pushd $_subdir
+     make INSTALL_ROOT="${pkgdir}" install
+     popd
+   done   
 }

README.md

@@ -1,60 +1,144 @@
-## This is Octopi, a powerful Pacman/AUR frontend using Qt libs.
+## This is Octopi, a powerful Pacman/AUR front end using Qt libs.
 
-The project site is hosted at https://octopiproject.wordpress.com
+![Main window](https://raw.githubusercontent.com/aarnt/octopi/master/octopi-mainwindow.png)
 
-Currently, 9 Linux distros are compatible with it
+The project site is hosted on https://tintaescura.com/projects/octopi
+
+Currently, 12 Linux distros are compatible with it
 
- * [Antergos](https://antergos.com/)
  * [ArchBang](http://archbang.org/)
- * [Arch](https://www.archlinux.org/)
- * [Chakra](https://chakralinux.org/)
+ * [Archcraft](https://archcraft.io/)
+ * [Arch Linux](https://www.archlinux.org/)
+ * [ArcoLinux](https://arcolinux.info/)
+ * [Artix Linux](https://artixlinux.org)
+ * [CachyOS](https://cachyos.org/)
+ * [EndeavourOS](https://endeavouros.com/)
+ * [Garuda Linux](https://garudalinux.org/)
  * [KaOS](https://kaosx.us/)
  * [Manjaro](https://manjaro.org/)
- * [mooOS](http://mooos.sourceforge.net/)
- * [Netrunner (rolling)](http://www.netrunner.com/netrunner-rolling-release/)
+ * [Obarun Linux](https://web.obarun.org/index.php?id=1)
  * [Parabola GNU/Linux-libre](https://www.parabola.nu/)
 
-### What you must install in your system to have Octopi fully functional
+### What you must install in order to have Octopi fully functional
 
 You'll need:
  * [Alpm_octopi_utils](https://github.com/aarnt/alpm_octopi_utils/) library
- * A privilege escalation tool to use it. Octopi supports gksu, kdesu and lxqt-sudo for that
- * qtermwidget >= 0.8 in order to build Octopi with embedded terminal support
- 
-### Simple steps to build Octopi code
+ * A helper to execute pacman commands called "octphelper", available on "./helper" dir
+ * A privilege escalation tool called [qt-sudo](https://github.com/aarnt/qt-sudo/)
+ * qtermwidget package, in order to build Octopi with embedded terminal support
 
-Assuming you have Qt5 libs properly installed, go to the directory where the code is located:
+### To install Octopi using pacman
+
+If Octopi package is available in your distro's repository, you can just type:
 
 ```
-$ cd OCTOPI_PATH
-$ qmake-qt5
+# pacman -S octopi
+```
+
+### Steps to build Octopi source code (qmake)
+
+Assuming you have vala compiler and Qt6 libs properly installed, follow these steps:
+
+```
+$ git clone https://github.com/aarnt/alpm_octopi_utils
+$ cd alpm_octopi_utils
 $ make
+# make install
+$ cd ..
+$ git clone https://github.com/aarnt/qt-sudo
+$ cd qt-sudo
+$ qmake6
+$ make
+# make install
+$ cd ..
+$ git clone https://github.com/aarnt/octopi
+$ cd octopi/helper
+$ qmake6
+$ make
+# make install
+$ cd ../notifier
+$ qmake6
+$ make
+# make install
+$ cd ../cachecleaner
+$ qmake6
+$ make
+# make install
+$ cd ../repoeditor
+$ qmake6
+$ make
+# make install
+$ cd ..
+$ qmake6
+$ make
+# make install
 ```
 
 You can also use the available PKGBUILD script that helps you build Octopi with all its tools:
 
 ```
-$ cd OCTOPI_PATH
+$ cd OCTOPI_PATH (where you git cloned the source code)
 $ makepkg -f
 ```
 
-### How to enable AUR support (that "alien" icon at toolbar)
+### Steps to build Octopi source code (CMake)
 
-To enable AUR support, you'll need to install [yaourt](https://archlinux.fr/yaourt-en), 
-[pacaur](https://github.com/rmarquis/pacaur) or [trizen](https://github.com/trizen/trizen) in your system.  
-In Chakra, [chaser](https://github.com/ccr-tools/chaser) will be supported out of the box.  
+As an alternative to qmake, Octopi can also be built with CMake. Make sure that at least CMake 3.5 is installed.
+
+First, build and install alpm_octopi_utils:
+
+```
+$ git clone https://github.com/aarnt/alpm_octopi_utils
+$ cd alpm_octopi_utils
+$ mkdir build_dir && cd build_dir
+$ cmake -G "Unix Makefiles" .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
+$ make
+$ sudo make install
+```
+
+Next, build and install Octopi:
+
+```
+$ git clone https://github.com/aarnt/octopi
+$ cd octopi
+$ mkdir build_dir && cd build_dir
+$ cmake -G "Unix Makefiles" .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
+$ make
+$ sudo make install
+```
+
+### To run Octopi
+
+```
+$ /usr/bin/octopi
+```
+
+### To run Octopi Notifier
+
+```
+$ /usr/bin/octopi-notifier
+```
+
+### To enable AUR support (that "green alien" icon on toolbar)
+
+You'll need to install [pacaur](https://github.com/rmarquis/pacaur), [paru](https://github.com/morganamilo/paru),
+[pikaur](https://github.com/actionless/pikaur), [trizen](https://github.com/trizen/trizen) or
+[yay](https://github.com/Jguer/yay) in your system.
+If neither of the previous tools are found Octopi will download latest "yay-bin" github binary.
 In KaOS, [kcp](https://github.com/bvaudour/kcp) will be supported out of the box.
 
 ### Ways to help/support Octopi
 
- * You can "Star" it at the Github page - https://github.com/aarnt/octopi/
- * You can vote in the AUR package available at https://aur.archlinux.org/packages/octopi/
- * You can translate it to your mother language at https://www.transifex.com/projects/p/octopi/
- * You can follow author's twitter account at https://twitter.com/aaarnt
- * You can buy author's technical book (currently in portuguese) about Octopi and Qt5 at 
+ * You can "Star" it on the Github page - https://github.com/aarnt/octopi/
+ * You can vote in the AUR package available on https://aur.archlinux.org/packages/octopi/
+ * You can translate it to your mother language on https://www.transifex.com/projects/p/octopi/
+ * You can follow author's twitter account on https://twitter.com/aaarnt
+ * You can buy author's technical book (currently in portuguese) about Octopi and Qt5 on
 http://www.amazon.com.br/Aprendendo-Qt-com-projeto-Octopi-ebook/dp/B015ICHKV6
+ * You can buy author's poem book (currently in portuguese) on meditation, Buddhism, cosmology and other subjects on
+https://www.amazon.com.br/Avidya-Alexandre-Arnt-ebook/dp/B0965LVWR3
  * You can write a review about it (text / video)
- * You can donate money to the project Paypal - http://sourceforge.net/donate/index.php?group_id=186459
+ * You can donate money to the author's Paypal - http://sourceforge.net/donate/index.php?group_id=186459
  * You can join the project ;-)
 
 

cachecleaner/.tx/config

@@ -1,8 +1,11 @@
 [main]
 host = https://www.transifex.com
 
-[octopi.cachecleaner]
-file_filter = resources/translations/octopi_cachecleaner_<lang>.ts
-source_file = resources/translations/octopi_cachecleaner_en.ts
-source_lang = en
-type = QT
+[o:arnt:p:octopi:r:cachecleaner]
+file_filter            = resources/translations/octopi_cachecleaner_<lang>.ts
+source_file            = resources/translations/octopi_cachecleaner_en.ts
+source_lang            = en
+type                   = QT
+replace_edited_strings = false
+keep_translations      = false
+

cachecleaner/CMakeLists.txt

@@ -0,0 +1,66 @@
+if (USE_QTERMWIDGET6)
+  find_package(Qt6 REQUIRED COMPONENTS Core Network Xml Widgets LinguistTools)
+else()
+  find_package(Qt5 REQUIRED COMPONENTS Core Network Xml Widgets LinguistTools)
+endif()
+
+set(CMAKE_AUTOMOC ON)
+
+file(GLOB TS_FILES LIST_DIRECTORIES false "${CMAKE_CURRENT_LIST_DIR}/resources/translations/*.ts")
+qt_add_translation(qmFiles ${TS_FILES})
+
+set(src 
+    main.cpp
+    cachecleaner.cpp
+    packagegroupmodel.cpp
+    ../src/strconstants.cpp
+    ../src/qaesencryption.cpp
+    ../src/unixcommand.cpp
+    ../src/wmhelper.cpp
+    ../src/terminal.cpp
+    ../src/settingsmanager.cpp
+    ../src/searchlineedit.cpp
+    ../src/utils.cpp
+    ../src/package.cpp
+    ../src/QtSolutions/qtsingleapplication.cpp
+    ../src/QtSolutions/qtlocalpeer.cpp
+    #../src/QtSolutions/qtlockedfile.cpp
+    ../src/QtSolutions/qtsinglecoreapplication.cpp)
+
+set(header 
+    cachecleaner.h
+    packagegroupmodel.h
+    ../src/strconstants.h
+    ../src/qaesencryption.h
+    ../src/unixcommand.h
+    ../src/wmhelper.h
+    ../src/terminal.h
+    ../src/settingsmanager.h
+    ../src/searchlineedit.h
+    ../src/utils.h
+    ../src/package.h
+    ../src/QtSolutions/qtsingleapplication.h
+    ../src/QtSolutions/qtlocalpeer.h
+    #../src/QtSolutions/qtlockedfile.h
+    ../src/QtSolutions/qtsinglecoreapplication.h)
+
+set(ui ui/cachecleaner.ui)
+
+set(qrc resources.qrc)
+
+qt_wrap_ui(src ${ui})
+qt_add_resources(src ${qrc})
+    
+add_executable(octopi-cachecleaner ${src} ${header} ${qmFiles})
+target_compile_definitions(octopi-cachecleaner PRIVATE QT_USE_QSTRINGBUILDER QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII QT_NO_URL_CAST_FROM_STRING QT_NO_CAST_FROM_BYTEARRAY)
+
+if (USE_QTERMWIDGET6)
+  target_include_directories(octopi-cachecleaner PRIVATE ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/src/QtSolutions" ${Qt6Core_INCLUDE_DIRS} ${Qt6Network_INCLUDE_DIRS} ${Qt6Xml_INCLUDE_DIRS} ${Qt6Widgets_INCLUDE_DIRS})
+  target_link_libraries(octopi-cachecleaner PRIVATE Qt6::Core Qt6::Network Qt6::Xml Qt6::Widgets)
+else()
+  target_include_directories(octopi-cachecleaner PRIVATE ${CMAKE_CURRENT_BINARY_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/src/QtSolutions" ${Qt5Core_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Xml_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS})
+  target_link_libraries(octopi-cachecleaner PRIVATE Qt5::Core Qt5::Network Qt5::Xml Qt5::Widgets)
+endif()
+
+install(TARGETS octopi-cachecleaner RUNTIME DESTINATION bin LIBRARY DESTINATION lib PUBLIC_HEADER DESTINATION include)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/octopi-cachecleaner.desktop" DESTINATION share/applications)

cachecleaner/cachecleaner.cpp

@@ -23,6 +23,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../src/strconstants.h"
 
 #include <QKeyEvent>
+#include <QTcpServer>
+#include <QTcpSocket>
+#include <QMessageBox>
 
 /*
  * CacheCleaner window constructor
@@ -40,20 +43,22 @@ CacheCleaner::CacheCleaner(QWidget *parent) :
   int keepUninstalled = SettingsManager::getKeepNumUninstalledPackages();
   ui->keepUninstalledPackagesSpinner->setValue(keepUninstalled);
 
-
   //create package group wrappers
-  m_installed = new PackageGroupModel("",
+  m_installed = new PackageGroupModel(QLatin1String(""),
                                       ui->installedPackagesList,
                                       ui->keepInstalledPackagesSpinner,
                                       ui->refreshInstalledButton,
                                       ui->cleanInstalledButton);
 
-  m_uninstalled = new PackageGroupModel("-u",
+  m_uninstalled = new PackageGroupModel(QStringLiteral("-u"),
                                         ui->uninstalledPackagesList,
                                         ui->keepUninstalledPackagesSpinner,
                                         ui->refreshUninstalledButton,                                                                                
                                         ui->cleanUninstalledButton);
 
+  m_tcpServer = new QTcpServer(this);
+  connect(m_tcpServer, &QTcpServer::newConnection, this, &CacheCleaner::onSendInfoToOctopiHelper);
+
   restoreGeometry(SettingsManager::getCacheCleanerWindowSize());
 }
 
@@ -67,6 +72,69 @@ CacheCleaner::~CacheCleaner()
   delete ui;
 }
 
+/*
+ * Start listening for helper connections
+ */
+bool CacheCleaner::startServer()
+{
+  bool res=true;
+
+  if (!m_tcpServer->listen(QHostAddress::LocalHost, 12703))
+  {
+    QMessageBox::critical(this, StrConstants::getApplicationName(),
+                          QStringLiteral("Unable to start the server: %1.")
+                          .arg(m_tcpServer->errorString()));
+    res=false;
+  }
+
+  return res;
+}
+
+/*
+ * Answers Helper if CacheCleaner is executing actions
+ */
+void CacheCleaner::onSendInfoToOctopiHelper()
+{
+  QString msg;
+  QByteArray block;
+  QDataStream out(&block, QIODevice::WriteOnly);
+  out.setVersion(QDataStream::Qt_5_15);
+
+  //Is octopi-helper running?
+  bool isHelperExecuting=UnixCommand::isOctopiHelperRunning();
+
+  bool commandExecuting = (m_installed->isExecutingCommand || m_uninstalled->isExecutingCommand);
+
+  if (isHelperExecuting && commandExecuting)
+  {
+    msg=QLatin1String("Octopi est occupatus");
+    out << msg;
+  }
+  else if (isHelperExecuting && !commandExecuting)
+  {
+    msg=QLatin1String("Octopi serenum est");
+    out << msg;
+  }
+  else
+  {
+    msg=QLatin1String("Atramento nigro");
+    out << msg;
+  }
+
+  QTcpSocket *clientConnection = m_tcpServer->nextPendingConnection();
+  if (clientConnection->isOpen())
+  {
+    connect(clientConnection, &QAbstractSocket::disconnected,
+          clientConnection, &QObject::deleteLater);
+
+    clientConnection->write(block);
+    clientConnection->disconnectFromHost();
+  }
+
+  //m_installed->isExecutingCommand=false;
+  //m_uninstalled->isExecutingCommand=false;
+}
+
 /*
  * Save settings when closing window
  */

cachecleaner/cachecleaner.h

@@ -25,6 +25,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 #include "packagegroupmodel.h"
 
+class QTcpServer;
+
 namespace Ui {
 class CacheCleaner;
 }
@@ -40,10 +42,15 @@ private:
     Ui::CacheCleaner *ui;
     PackageGroupModel *m_installed;
     PackageGroupModel *m_uninstalled;
+    QTcpServer *m_tcpServer;
+
+private slots:
+  void onSendInfoToOctopiHelper();
 
 public:
     explicit CacheCleaner(QWidget *parent = 0);
     ~CacheCleaner();
+    bool startServer();
 
 protected:
     void closeEvent(QCloseEvent *);

cachecleaner/main.cpp

@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "cachecleaner.h"
-#include "../../src/strconstants.h"
+#include "../src/strconstants.h"
 #include "../src/QtSolutions/qtsingleapplication.h"
 
 #include <QApplication>
@@ -31,37 +31,59 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 int main( int argc, char *argv[] )
 {
-  QtSingleApplication app( "Cache Cleaner - Octopi", argc, argv );
+  unsetenv("TMPDIR");
+  QtSingleApplication app( QStringLiteral("Cache Cleaner - Octopi"), argc, argv );
 
   //If there is already an instance running...
   if (app.isRunning())
   {
-    app.sendMessage("RAISE");
+    app.sendMessage(QStringLiteral("RAISE"));
     return 0;
   }
 
-  app.sendMessage("RAISE");
+  app.sendMessage(QStringLiteral("RAISE"));
 
   QTranslator appTranslator;
-  appTranslator.load(":/resources/translations/octopi_cachecleaner_" +
+  appTranslator.load(QLatin1String(":/resources/translations/octopi_cachecleaner_") +
                      QLocale::system().name());
   app.installTranslator(&appTranslator);
 
   if (UnixCommand::isRootRunning()){
-    QMessageBox::critical( 0, StrConstants::getApplicationName(), StrConstants::getErrorRunningWithRoot());
-    return ( -2 );
+    QMessageBox::critical( nullptr, StrConstants::getApplicationName(), StrConstants::getErrorRunningWithRoot());
+    return (-2);
   }
 
-  if (!UnixCommand::hasTheExecutable("paccache"))
+  if (!UnixCommand::hasTheExecutable(QStringLiteral("paccache")))
   {
-    QMessageBox::critical( 0, StrConstants::getApplicationName(), StrConstants::getExecutableCouldNotBeFound().arg("\"paccache\""));
-    return ( -3 );
+    QMessageBox::critical( nullptr, StrConstants::getApplicationName(), StrConstants::getExecutableCouldNotBeFound().arg(QStringLiteral("\"paccache\"")));
+    return (-3);
+  }
+
+  if (!QFile::exists(ctn_OCTOPI_HELPER_PATH))
+  {
+    qDebug() << "Aborting cache-cleaner as 'octphelper' binary could not be found! [" << ctn_OCTOPI_HELPER_PATH << "]";
+    return (-4);
+  }
+
+  if (!QFile::exists(ctn_OCTOPISUDO))
+  {
+    qDebug() << "Aborting cache-cleaner as 'octopi-sudo' binary could not be found! [" << ctn_OCTOPISUDO << "]";
+    return (-5);
+  }
+
+  if (!UnixCommand::isOctoToolRunning(QStringLiteral("octopi-cachecle")))
+  {
+    QMessageBox::critical(nullptr, StrConstants::getApplicationName(), StrConstants::getErrorRunOctopiCacheCleanerAsUsrBin());
+    return (-6);
   }
 
   CacheCleaner w;
-  app.setActivationWindow(&w);
-  w.show();
-  QResource::registerResource("./resources.qrc");
+  if (w.startServer())
+  {
+    app.setActivationWindow(&w);
+    w.show();
+    QResource::registerResource(QStringLiteral("./resources.qrc"));
 
-  return app.exec();
+    return app.exec();
+  }
 }

cachecleaner/octopi-cachecleaner.desktop

@@ -1,9 +1,11 @@
 [Desktop Entry]
 Name=Octopi CacheCleaner
 Icon=octopi
-Exec=octopi-cachecleaner
+Exec=/usr/bin/octopi-cachecleaner
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;System;
 #NotShowIn=GNOME;XFCE;LXDE;KDE;
 StartupNotify=true
+Version=1.5
+SingleMainWindow=true

cachecleaner/octopi-cachecleaner.pro

@@ -7,6 +7,14 @@
 QT += core gui network xml widgets
 
 CONFIG += qt console warn_on debug
+
+# Disable automatic string conversions
+DEFINES += QT_USE_QSTRINGBUILDER \
+           QT_NO_CAST_FROM_ASCII \
+           QT_NO_CAST_TO_ASCII \
+           QT_NO_URL_CAST_FROM_STRING \
+           QT_NO_CAST_FROM_BYTEARRAY
+
 TEMPLATE = app
 DESTDIR += bin
 OBJECTS_DIR += build
@@ -16,6 +24,7 @@ UI_DIR += build
 HEADERS +=  cachecleaner.h \
             packagegroupmodel.h \
             ../src/strconstants.h \
+            ../src/qaesencryption.h \
             ../src/unixcommand.h \
             ../src/wmhelper.h \
             ../src/terminal.h \
@@ -33,6 +42,7 @@ SOURCES +=  main.cpp \
             cachecleaner.cpp \
             packagegroupmodel.cpp \
             ../src/strconstants.cpp \
+            ../src/qaesencryption.cpp \
             ../src/unixcommand.cpp \
             ../src/wmhelper.cpp \
             ../src/terminal.cpp \
@@ -94,8 +104,10 @@ TRANSLATIONS += resources/translations/octopi_cachecleaner_pt_BR.ts \
     resources/translations/octopi_cachecleaner_gl_ES.ts \
     resources/translations/octopi_cachecleaner_ast.ts \
     resources/translations/octopi_cachecleaner_hr.ts \
-    resources/translations/octopi_cachecleaner_zh-Hans.ts
-    resources/translations/octopi_cachecleaner_zh_CN.ts
+    resources/translations/octopi_cachecleaner_zh-Hans.ts \
+    resources/translations/octopi_cachecleaner_zh_CN.ts \
+    resources/translations/octopi_cachecleaner_ko.ts \
+    resources/translations/octopi_cachecleaner_ko_KR.ts \
     
 # install
 isEmpty(PREFIX) {

cachecleaner/packagegroupmodel.cpp

@@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "packagegroupmodel.h"
 #include "../src/strconstants.h"
 
+#include <QSharedMemory>
 #include <QApplication>
 #include <QMessageBox>
 
@@ -37,7 +38,7 @@ PackageGroupModel::PackageGroupModel(QString optionsString,
                                      QSpinBox *spinner,
                                      QPushButton *refreshBtn,
                                      QPushButton *cleanBtn)
-                                        : QObject(NULL),
+                                        : QObject(nullptr),
                                         m_optionsString(optionsString), 
                                         m_listView(listView), 
                                         m_spinner(spinner), 
@@ -49,6 +50,8 @@ PackageGroupModel::PackageGroupModel(QString optionsString,
 {
   m_cleanButton->setText(tr("Clean"));
 
+  m_sharedMemory=new QSharedMemory(QStringLiteral("org.arnt.octopi"), this);
+
   //setup UI slots
   connect( m_spinner, SIGNAL( valueChanged(int) ), SLOT( updateKeepArchives() ) );
   connect( m_spinner, SIGNAL( valueChanged(int) ), SLOT( refreshCacheView() ) );
@@ -67,6 +70,7 @@ PackageGroupModel::PackageGroupModel(QString optionsString,
  */
 PackageGroupModel::~PackageGroupModel()
 {
+  UnixCommand::removeSharedMemFiles();
   delete m_acc;
   delete m_cmd;
 }
@@ -96,7 +100,7 @@ void PackageGroupModel::keepArchivesChanged()
  */
 QString PackageGroupModel::getOptions()
 {
-  return m_optionsString + " -k " + QString::number(m_spinner->value());
+  return m_optionsString + QLatin1String("-k ") + QString::number(m_spinner->value());
 }
 
 /*
@@ -119,7 +123,12 @@ void PackageGroupModel::refreshCacheView()
   QObject::connect(m_cmd, SIGNAL( finished ( int, QProcess::ExitStatus )),
                    this, SLOT( finishedDryrun ( int, QProcess::ExitStatus )) );
 
-  m_cmd->executeCommandAsNormalUser("paccache -v -d " + getOptions());
+  QStringList sl;
+  sl << QStringLiteral("-v");
+  sl << QStringLiteral("-d");
+  QStringList opt = getOptions().split(QStringLiteral(" "), Qt::SkipEmptyParts);
+  sl << opt;
+  m_cmd->executeCommandAsNormalUser(QStringLiteral("/usr/bin/paccache"), sl);
   isExecutingCommand = true;
 }
 
@@ -135,9 +144,9 @@ bool PackageGroupModel::isSUAvailable()
     return true;
   }
   else if (WMHelper::getSUCommand() == ctn_NO_SU_COMMAND){
-    QMessageBox::critical( 0, StrConstants::getApplicationName(),
+    QMessageBox::critical( nullptr, StrConstants::getApplicationName(),
                            StrConstants::getErrorNoSuCommand() +
-                           "\n" + StrConstants::getYoullNeedSuFrontend());
+                           QLatin1String("\n") + StrConstants::getYoullNeedSuFrontend());
     return false;
   }
   else
@@ -149,7 +158,11 @@ bool PackageGroupModel::isSUAvailable()
  */
 void PackageGroupModel::cleanCache()
 {
-  if (isExecutingCommand) return;
+  if (isExecutingCommand || UnixCommand::isPacmanDbLocked()){
+    QMessageBox::critical( nullptr, StrConstants::getApplicationName(),
+                           StrConstants::getErrorDbLock());
+    return;
+  }
 
   if (!isSUAvailable())
     return;
@@ -164,9 +177,10 @@ void PackageGroupModel::cleanCache()
   QObject::connect(m_cmd, SIGNAL( finished ( int, QProcess::ExitStatus )),
                    this, SLOT( finishedClean( int, QProcess::ExitStatus )) );
 
-  QByteArray tmp = "paccache -r " + getOptions().toLatin1();
-  m_cmd->executeCommand(QLatin1String(tmp), ectn_LANG_USER_DEFINED);
   isExecutingCommand = true;
+  const QString tmp = QLatin1String("paccache -r ") + getOptions();
+  //UnixCommand::removeTemporaryFiles();
+  m_cmd->executeCommandWithSharedMemHelper(tmp, m_sharedMemory);
 }
 
 /*
@@ -185,7 +199,7 @@ void PackageGroupModel::finishedDryrun(int exitCode, QProcess::ExitStatus)
   if(exitCode > 1)
   {
     //process failed, provide info on errors
-    QMessageBox::critical(m_listView, "Error whith the underlying process", m_acc->getErrors());
+    QMessageBox::critical(m_listView, QStringLiteral("Error with the underlying process"), m_acc->getErrors());
   }
   else if (exitCode == 0)
   {
@@ -229,9 +243,9 @@ void PackageGroupModel::finishedClean(int exitCode, QProcess::ExitStatus)
  * @param output The output of the dryrun process
  */
 void PackageGroupModel::processDryrunResult(QString output) {
-  QStringList lines = output.split(QRegularExpression("\\n"), QString::SkipEmptyParts);
+  QStringList lines = output.split(QRegularExpression(QStringLiteral("\\n")), Qt::SkipEmptyParts);
 
-  if(lines.length() == 1 || output.contains("*.pkg.tar?(.+([^.]))"))
+  if(lines.length() == 1 || output.contains(QLatin1String("*.pkg.tar?(.+([^.]))")))
   {
     //"==> no candidate packages found for pruning"
     m_cleanButton->setText(tr("Clean"));
@@ -241,7 +255,7 @@ void PackageGroupModel::processDryrunResult(QString output) {
     //process package list
     for(int i = 0; i < lines.length(); i++)
     {
-      QString line = lines.at(i);
+      const QString& line = lines.at(i);
 
       if(i == 0)
         //skip the first line ("==> Candidate packages:")
@@ -250,14 +264,14 @@ void PackageGroupModel::processDryrunResult(QString output) {
       else if(i == lines.length() - 1)
       {
         //extract size from "==> finished dry run: 8 candidates (disk space saved: 19.11 MiB)")
-        QStringList components = line.split(" ");
+        QStringList components = line.split(QStringLiteral(" "));
 
         QString unit = components.takeLast();
         unit.remove(unit.length() - 1, 1);
 
         QString size = components.takeLast();
 
-        m_cleanButton->setText(tr("Clean %1").arg(" " + size + " " + unit));
+        m_cleanButton->setText(tr("Clean %1").arg(QLatin1Char(' ') + size + QLatin1Char(' ') + unit));
       }
       else
         m_listView->addItem(line);

cachecleaner/packagegroupmodel.h

@@ -82,11 +82,12 @@ class PackageGroupModel : public QObject
 
 private:
   bool isSUAvailable();
-  bool isExecutingCommand;
+  QSharedMemory *m_sharedMemory;
 
 public:
     PackageGroupModel(QString, QListWidget *, QSpinBox *, QPushButton *, QPushButton *);
     ~PackageGroupModel();
+    bool isExecutingCommand;
 
 protected:
     QString m_optionsString;

cachecleaner/resources.qrc

@@ -41,6 +41,7 @@
         <file>resources/translations/octopi_cachecleaner_sv.qm</file>
         <file>resources/translations/octopi_cachecleaner_sl.qm</file>
         <file>resources/translations/octopi_cachecleaner_tr_TR.qm</file>
+        <file>resources/translations/octopi_cachecleaner_tr.qm</file>
         <file>resources/translations/octopi_cachecleaner_uk.qm</file>
         <file>resources/translations/octopi_cachecleaner_uz.qm</file>
         <file>resources/translations/octopi_cachecleaner_vi.qm</file>
@@ -48,5 +49,6 @@
         <file>resources/translations/octopi_cachecleaner_zh-Hans.qm</file>
         <file>resources/translations/octopi_cachecleaner_zh_CN.qm</file>
         <file>resources/translations/octopi_cachecleaner_hr.qm</file>
+        <file>resources/translations/octopi_cachecleaner_ko.qm</file>
     </qresource>
 </RCC>

cachecleaner/resources/translations/octopi_cachecleaner_ast.ts

@@ -4,7 +4,7 @@
     <message>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="14"/>
         <source>Cache Cleaner - Octopi</source>
-        <translation>Llimpiador de caché - Octopi</translation>
+        <translation>Llimpiador de la caché - Octopi</translation>
     </message>
     <message>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="49"/>
@@ -21,7 +21,7 @@
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="82"/>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="157"/>
         <source>Number of old versions to keep</source>
-        <translation>Númberu de versiones vieyes pa caltener</translation>
+        <translation>Númberu de versiones vieyes a caltener</translation>
     </message>
     <message>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="102"/>

cachecleaner/resources/translations/octopi_cachecleaner_bg.ts

@@ -4,12 +4,12 @@
     <message>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="14"/>
         <source>Cache Cleaner - Octopi</source>
-        <translation>Чистач на кеш памет - Octopi</translation>
+        <translation>Почистване на кеша - „Octopi“</translation>
     </message>
     <message>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="49"/>
         <source>Uninstalled packages</source>
-        <translation>Деинсталирани пакети</translation>
+        <translation>Премахнати пакети</translation>
     </message>
     <message>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="75"/>

cachecleaner/resources/translations/octopi_cachecleaner_de.ts

@@ -4,7 +4,7 @@
     <message>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="14"/>
         <source>Cache Cleaner - Octopi</source>
-        <translation>Cache säubern - Octopi</translation>
+        <translation>Zwischenspeicher säubern - Octopi</translation>
     </message>
     <message>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="49"/>

cachecleaner/resources/translations/octopi_cachecleaner_fi.ts

@@ -15,7 +15,7 @@
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="75"/>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="150"/>
         <source>Keep :</source>
-        <translation>Säilytä</translation>
+        <translation>Säilytä:</translation>
     </message>
     <message>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="82"/>

cachecleaner/resources/translations/octopi_cachecleaner_fi_FI.ts

@@ -40,12 +40,12 @@
     <message>
         <location filename="Projects/octopi/cachecleaner/packagegroupmodel.cpp" line="199"/>
         <source>Clean</source>
-        <translation>Putsaa</translation>
+        <translation>Tyhjennä</translation>
     </message>
     <message>
         <location filename="Projects/octopi/cachecleaner/packagegroupmodel.cpp" line="222"/>
         <source>Clean %1</source>
-        <translation>Putsattu 1%</translation>
+        <translation>Tyhjennä %1</translation>
     </message>
 </context>
 </TS>

cachecleaner/resources/translations/octopi_cachecleaner_hi.ts

@@ -4,7 +4,7 @@
     <message>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="14"/>
         <source>Cache Cleaner - Octopi</source>
-        <translation>कैश हटाए - Octopi</translation>
+        <translation>कैश हटाने हेतु साधन - ऑक्टोपी</translation>
     </message>
     <message>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="49"/>
@@ -21,7 +21,7 @@
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="82"/>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="157"/>
         <source>Number of old versions to keep</source>
-        <translation>पुराने पैकेज संस्करणों की संख्या, जिन्हें रखना है</translation>
+        <translation>रखने हेतु पुराने पैकेज की संस्करण संख्या</translation>
     </message>
     <message>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="102"/>
@@ -40,12 +40,12 @@
     <message>
         <location filename="Projects/octopi/cachecleaner/packagegroupmodel.cpp" line="199"/>
         <source>Clean</source>
-        <translation>हटाए</translation>
+        <translation>हटाएँ</translation>
     </message>
     <message>
         <location filename="Projects/octopi/cachecleaner/packagegroupmodel.cpp" line="222"/>
         <source>Clean %1</source>
-        <translation>%1 हटाए</translation>
+        <translation>%1 हटाएँ</translation>
     </message>
 </context>
 </TS>

cachecleaner/resources/translations/octopi_cachecleaner_hi_IN.ts

@@ -4,7 +4,7 @@
     <message>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="14"/>
         <source>Cache Cleaner - Octopi</source>
-        <translation>कैश की सफाई - Octopi</translation>
+        <translation>कैश हटाने हेतु साधन - ऑक्टोपी</translation>
     </message>
     <message>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="49"/>
@@ -21,13 +21,13 @@
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="82"/>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="157"/>
         <source>Number of old versions to keep</source>
-        <translation>पुराने पैकेज संस्करणों की संख्या, जिन्हें रखना है</translation>
+        <translation>रखने हेतु पुराने पैकेज की संस्करण संख्या</translation>
     </message>
     <message>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="102"/>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="183"/>
         <source>Refresh</source>
-        <translation>रिफ्रेश करें</translation>
+        <translation> रिफ्रेश करें</translation>
     </message>
     <message>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="127"/>
@@ -40,12 +40,12 @@
     <message>
         <location filename="Projects/octopi/cachecleaner/packagegroupmodel.cpp" line="199"/>
         <source>Clean</source>
-        <translation>साफ़ करें</translation>
+        <translation>हटाएँ</translation>
     </message>
     <message>
         <location filename="Projects/octopi/cachecleaner/packagegroupmodel.cpp" line="222"/>
         <source>Clean %1</source>
-        <translation>%1 साफ़ करें</translation>
+        <translation>%1 हटाएँ</translation>
     </message>
 </context>
 </TS>

cachecleaner/resources/translations/octopi_cachecleaner_ko.ts

@@ -0,0 +1,51 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ko" version="2.0">
+<context>
+    <name>CacheCleaner</name>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="14"/>
+        <source>Cache Cleaner - Octopi</source>
+        <translation>캐시 청소도구 - Octopi</translation>
+    </message>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="49"/>
+        <source>Uninstalled packages</source>
+        <translation>제거된 패키지</translation>
+    </message>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="75"/>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="150"/>
+        <source>Keep :</source>
+        <translation>보관 :</translation>
+    </message>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="82"/>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="157"/>
+        <source>Number of old versions to keep</source>
+        <translation>보관할 이전 버전 수</translation>
+    </message>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="102"/>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="183"/>
+        <source>Refresh</source>
+        <translation>새로 고침</translation>
+    </message>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="127"/>
+        <source>Installed packages</source>
+        <translation>새로 고침</translation>
+    </message>
+</context>
+<context>
+    <name>PackageGroupModel</name>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/packagegroupmodel.cpp" line="199"/>
+        <source>Clean</source>
+        <translation>청소하기</translation>
+    </message>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/packagegroupmodel.cpp" line="222"/>
+        <source>Clean %1</source>
+        <translation>%1 청소하기</translation>
+    </message>
+</context>
+</TS>

cachecleaner/resources/translations/octopi_cachecleaner_ko_KR.ts

@@ -0,0 +1,51 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ko_KR" version="2.0">
+<context>
+    <name>CacheCleaner</name>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="14"/>
+        <source>Cache Cleaner - Octopi</source>
+        <translation>캐시 클리너 - Octopi</translation>
+    </message>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="49"/>
+        <source>Uninstalled packages</source>
+        <translation>제거된  패키지</translation>
+    </message>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="75"/>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="150"/>
+        <source>Keep :</source>
+        <translation>보관 :</translation>
+    </message>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="82"/>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="157"/>
+        <source>Number of old versions to keep</source>
+        <translation>보관할 이전 버전 수</translation>
+    </message>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="102"/>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="183"/>
+        <source>Refresh</source>
+        <translation>새로 고침</translation>
+    </message>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="127"/>
+        <source>Installed packages</source>
+        <translation>설치된 패키지</translation>
+    </message>
+</context>
+<context>
+    <name>PackageGroupModel</name>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/packagegroupmodel.cpp" line="199"/>
+        <source>Clean</source>
+        <translation>청소하기</translation>
+    </message>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/packagegroupmodel.cpp" line="222"/>
+        <source>Clean %1</source>
+        <translation>%1 청소하기</translation>
+    </message>
+</context>
+</TS>

cachecleaner/resources/translations/octopi_cachecleaner_pt_PT.ts

@@ -4,12 +4,12 @@
     <message>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="14"/>
         <source>Cache Cleaner - Octopi</source>
-        <translation>Limpador de cache - Octopi</translation>
+        <translation>Limpeza de Cache - Octopi</translation>
     </message>
     <message>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="49"/>
         <source>Uninstalled packages</source>
-        <translation>Pacotes não instalados</translation>
+        <translation>Pacotes desinstalados</translation>
     </message>
     <message>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="75"/>
@@ -27,7 +27,7 @@
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="102"/>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="183"/>
         <source>Refresh</source>
-        <translation>Actualizar</translation>
+        <translation>Atualizar</translation>
     </message>
     <message>
         <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="127"/>

cachecleaner/resources/translations/octopi_cachecleaner_tr.ts

@@ -0,0 +1,51 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="tr" version="2.0">
+<context>
+    <name>CacheCleaner</name>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="14"/>
+        <source>Cache Cleaner - Octopi</source>
+        <translation>Ön Bellek Temizleyici - Octupi</translation>
+    </message>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="49"/>
+        <source>Uninstalled packages</source>
+        <translation>Kaldırılmış paketler</translation>
+    </message>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="75"/>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="150"/>
+        <source>Keep :</source>
+        <translation>Sakla:</translation>
+    </message>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="82"/>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="157"/>
+        <source>Number of old versions to keep</source>
+        <translation>Saklanacak eski versiyonların sayısı</translation>
+    </message>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="102"/>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="183"/>
+        <source>Refresh</source>
+        <translation>Yenile</translation>
+    </message>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/ui/cachecleaner.ui" line="127"/>
+        <source>Installed packages</source>
+        <translation>Yüklenmiş paketler</translation>
+    </message>
+</context>
+<context>
+    <name>PackageGroupModel</name>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/packagegroupmodel.cpp" line="199"/>
+        <source>Clean</source>
+        <translation>Temizle</translation>
+    </message>
+    <message>
+        <location filename="Projects/octopi/cachecleaner/packagegroupmodel.cpp" line="222"/>
+        <source>Clean %1</source>
+        <translation>Temiz %1</translation>
+    </message>
+</context>
+</TS>

helper/CMakeLists.txt

@@ -0,0 +1,24 @@
+if (USE_QTERMWIDGET6)
+  find_package(Qt6 REQUIRED COMPONENTS Core Network)
+else()
+  find_package(Qt5 REQUIRED COMPONENTS Core Network)
+endif()
+
+set(CMAKE_AUTOMOC ON)
+
+set(src main.cpp octopihelper.cpp ../src/argumentlist.cpp)
+
+set(header octopihelper.h ../src/argumentlist.h)
+
+add_executable(octphelper ${src} ${header})
+target_compile_definitions(octphelper PRIVATE QT_DEPRECATED_WARNINGS QT_USE_QSTRINGBUILDER QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII QT_NO_URL_CAST_FROM_STRING QT_NO_CAST_FROM_BYTEARRAY QT_NO_FOREACH)
+
+if (USE_QTERMWIDGET6)
+  target_include_directories(octphelper PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${Qt6Core_INCLUDE_DIRS} ${Qt6Network_INCLUDE_DIRS})
+  target_link_libraries(octphelper PRIVATE Qt6::Core Qt6::Network)
+else()
+  target_include_directories(octphelper PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS})
+  target_link_libraries(octphelper PRIVATE Qt5::Core Qt5::Network)
+endif()
+
+install(TARGETS octphelper RUNTIME DESTINATION lib/octopi LIBRARY DESTINATION lib PUBLIC_HEADER DESTINATION include)

helper/README.md

@@ -0,0 +1,5 @@
+## OCTOPI-HELPER
+
+This is a simple helper to execute octopi transactions. It aims to ease integration with sudo NOPASSWD switch.
+
+NOPASSWD mode will *ONLY* work with integrated ["octopi-sudo"](https://github.com/aarnt/octopi/tree/master/sudo) root escalation tool.

helper/main.cpp

@@ -0,0 +1,67 @@
+/*
+* This file is part of Octopi, an open-source GUI for pacman.
+* Copyright (C) 2019 Alexandre Albuquerque Arnt
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*
+*/
+
+#include "octopihelper.h"
+#include "../src/argumentlist.h"
+#include <unistd.h>
+
+#include <QCoreApplication>
+#include <QTextStream>
+
+bool isRootRunning()
+{
+  int uid = geteuid();
+  return (uid == 0);
+}
+
+int main(int argc, char *argv[])
+{
+  ArgumentList *argList = new ArgumentList(argc, argv);
+
+  if (argList->getSwitch(QStringLiteral("-version")))
+  {
+    QTextStream qout(stdout);
+    qout << "octopi-helper: version " << ctn_APPLICATION_VERSION << Qt::endl;
+    return 0;
+  }
+
+  if (!isRootRunning())
+  {
+    QTextStream qout(stdout);
+    qout << Qt::endl << "octopi-helper[aborted]: Only root can run..." << Qt::endl;
+    return ctn_NO_ROOT_RUNNING;
+  }
+
+  QCoreApplication a(argc, argv);
+  unsetenv("TMPDIR");
+
+  OctopiHelper helper;
+
+  if (argList->getSwitch(QStringLiteral("-ts")))
+  {
+    return helper.executePkgTransactionWithSharedMem();
+  }
+  else
+  {
+    QTextStream qout(stdout);
+    qout << Qt::endl << "octopi-helper[aborted]: Suspicious execution method" << Qt::endl;
+    return ctn_SUSPICIOUS_EXECUTION_METHOD;
+  }
+}

helper/octopi-helper.pro

@@ -0,0 +1,49 @@
+QT -= gui
+QT += core network
+
+CONFIG += c++11 console
+CONFIG -= app_bundle
+TARGET = octphelper
+
+# The following define makes your compiler emit warnings if you use
+# any Qt feature that has been marked deprecated (the exact warnings
+# depend on your compiler). Please consult the documentation of the
+# deprecated API in order to know how to port your code away from it.
+DEFINES += QT_DEPRECATED_WARNINGS
+
+# Disable automatic string conversions
+DEFINES += QT_USE_QSTRINGBUILDER \
+           QT_NO_CAST_FROM_ASCII \
+           QT_NO_CAST_TO_ASCII \
+           QT_NO_URL_CAST_FROM_STRING \
+           QT_NO_CAST_FROM_BYTEARRAY \
+           QT_NO_FOREACH
+
+# You can also make your code fail to compile if it uses deprecated APIs.
+# In order to do so, uncomment the following line.
+# You can also select to disable deprecated APIs only up to a certain version of Qt.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+
+HEADERS += \
+    ../src/argumentlist.h \
+    octopihelper.h
+
+SOURCES += \
+        main.cpp \
+    ../src/argumentlist.cpp \
+    octopihelper.cpp
+
+# install
+isEmpty(PREFIX) {
+    PREFIX = /usr
+}
+ 
+isEmpty(LIBDIR) {
+    LIBDIR = $$PREFIX/lib
+}
+
+target.path = $$LIBDIR/octopi
+sources.files = $$SOURCES $$HEADERS *.pro
+sources.path = .
+
+INSTALLS += target

helper/octopihelper.cpp

@@ -0,0 +1,505 @@
+/*
+* This file is part of Octopi, an open-source GUI for pacman.
+* Copyright (C) 2019 Alexandre Albuquerque Arnt
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*
+*/
+
+#include "../src/constants.h"
+#include "octopihelper.h"
+
+#include <QProcess>
+#include <QDir>
+#include <QObject>
+#include <QTextStream>
+#include <QSharedMemory>
+#include <QRegularExpression>
+#include <QStringLiteral>
+#include <QTcpSocket>
+#include <QDataStream>
+#include <QFile>
+#include <QSettings>
+#include <QDateTime>
+
+QFile *OctopiHelper::m_temporaryFile = nullptr;
+
+/*
+ * Removes temporary transaction files
+ */
+void removeTemporaryFiles()
+{
+  QDir tempDir(QDir::tempPath());
+  QStringList nameFilters;
+  nameFilters << QStringLiteral(".qt_temp_octopi*");
+  const QFileInfoList list = tempDir.entryInfoList(nameFilters, QDir::Dirs | QDir::Files | QDir::System | QDir::Hidden);
+
+  for(const auto &file : list){
+    QFile fileAux(file.filePath());
+
+    if (!file.isDir()){
+      fileAux.remove();
+    }
+    else{
+      QDir dir(file.filePath());
+      const QFileInfoList listd = dir.entryInfoList(QDir::Files | QDir::System);
+
+      for(const auto &filed : listd){
+        QFile fileAuxd(filed.filePath());
+        fileAuxd.remove();
+      }
+
+      dir.rmdir(file.filePath());
+    }
+  }
+}
+
+/*
+ * Returns the SHELL environment variable, if not set defaults to bash.
+ */
+QString getShell()
+{
+  QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+  QString shell = env.value(QStringLiteral("SHELL"), QStringLiteral("/usr/bin/bash"));
+  QFileInfo fi(shell);
+
+  if (fi.fileName() == QLatin1String("fish"))
+    return QStringLiteral("/usr/bin/bash");
+  else
+    return fi.fileName();
+}
+
+/*
+ * If justOneInstance = false (default), returns TRUE if one instance of the app is ALREADY running
+ * Otherwise, it returns TRUE if the given app is running.
+ */
+bool isAppRunning(const QString &appName, bool justOneInstance)
+{
+  QStringList slParam;
+  QProcess proc;
+  slParam << QStringLiteral("-C");
+  slParam << appName;
+  proc.start(QStringLiteral("/usr/bin/ps"), slParam);
+  proc.waitForFinished();
+  QString out = QString::fromUtf8(proc.readAll());
+  proc.close();
+
+  if (justOneInstance)
+  {
+    return out.count(appName)>0;
+  }
+  else
+  {
+    return out.count(appName)>1;
+  }
+}
+
+OctopiHelper::OctopiHelper()
+{  
+  //If old helper still exists, let's remove it
+  if (QFileInfo::exists(QStringLiteral("/usr/lib/octopi/octopi-helper")))
+    QFile::remove(QStringLiteral("/usr/lib/octopi/octopi-helper"));
+
+  m_exitCode = -9999;
+  m_process = new QProcess();
+  //m_suspiciousChars = QStringLiteral("(\\s|[][!#$&'()*,;<=+>?\\^`{}|~])");
+  m_suspiciousChars = QStringLiteral("[!#$&'()*,;<=>?\\^`{}|~\\[\\]]");
+
+  //These settings enable all "pacman" output go thru QProcess output methods
+  m_process->setProcessChannelMode(QProcess::ForwardedChannels);
+  m_process->setInputChannelMode(QProcess::ForwardedInputChannel);
+
+  QString fname = QStringLiteral("/usr/lib/octopi/octphelper.log");
+  m_logFile.setFileName(fname);
+  m_logFile.open(QIODevice::WriteOnly | /*QIODevice::Append |*/ QIODevice::Text);
+}
+
+OctopiHelper::~OctopiHelper()
+{
+  m_process->close();
+  if (m_temporaryFile != nullptr)
+    QFile::remove(m_temporaryFile->fileName());
+  removeTemporaryFiles();
+
+  if (m_logFile.isOpen())
+    m_logFile.close();
+}
+
+/*
+ * Logs received str in a file called "octphelper.log" (for debugging purposes)
+ */
+void OctopiHelper::log(const QString &str)
+{
+  QString dateTimeFormat = QLocale().dateTimeFormat(QLocale::ShortFormat);
+  QDateTime bdt = QDateTime::currentDateTime();
+
+  QTextStream out(&m_logFile);
+  out << bdt.toString(dateTimeFormat) << QLatin1String(": ") << str << Qt::endl;
+
+  m_logFile.flush();
+}
+
+/*
+ * A bit of settings to better run "pacman" commands using QProcess
+ */
+QProcessEnvironment OctopiHelper::getProcessEnvironment()
+{
+  QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+  env.remove(QStringLiteral("LANG"));
+  env.remove(QStringLiteral("LC_MESSAGES"));
+  env.insert(QStringLiteral("LANG"), QStringLiteral("C.UTF-8"));
+  env.insert(QStringLiteral("LC_MESSAGES"), QStringLiteral("C.UTF-8"));
+  env.remove(QStringLiteral("COLUMNS"));
+  env.insert(QStringLiteral("COLUMNS"), QStringLiteral("132"));
+  return env;
+}
+
+/*
+ * Retrieves Proxy_Settings config from "/root/.config/octopi/octopi.conf"
+ */
+QString OctopiHelper::getProxySettings()
+{
+  QSettings settings(QSettings::UserScope, ctn_ORGANIZATION, ctn_APPLICATION);
+  return (settings.value(ctn_KEY_PROXY_SETTINGS, QLatin1String("")).toString());
+}
+
+/*
+ * Checks if Octopi/Octopi-notifier, cache-cleaner, etc is being executed
+ */
+bool OctopiHelper::isOctoToolRunning(const QString &octoToolName)
+{
+  bool res=false;
+
+  QProcess proc;
+  proc.setProcessEnvironment(getProcessEnvironment());
+  QStringList sl;
+  sl << QStringLiteral("-C");
+  sl << octoToolName;
+  sl << QStringLiteral("-o");
+  sl << QStringLiteral("command");
+  proc.start(QStringLiteral("/usr/bin/ps"), sl);
+  proc.waitForFinished();
+
+  QString out = QString::fromUtf8(proc.readAll().trimmed());
+  if (out.contains(QLatin1String("|"))) return false;
+  out=out.remove(QStringLiteral("\n"));
+  out=out.remove(QStringLiteral("COMMAND"));
+
+  if (octoToolName==QLatin1String("octopi-cachecle"))
+  {
+    if (out == QLatin1String("/usr/bin/octopi-cachecleaner")) res=true;
+  }
+  else
+  {
+    QStringList options;
+    options << QStringLiteral("/usr/bin/octopi-notifier -d");
+    options << QStringLiteral("/usr/bin/octopi -d");
+    options << QStringLiteral("/usr/bin/octopi -sysupgrade");
+    options << QStringLiteral("/usr/bin/octopi -sysupgrade-noconfirm");
+
+    //QRegularExpression re(QStringLiteral("(/usr/bin/octopi-notifier -session )[a-fA-F0-9_]+"));
+    QRegularExpression re(QStringLiteral("(/usr/bin/octopi-notifier.*)"));
+    QRegularExpressionMatch match = re.match(out);
+    bool hasMatchInSession = match.capturedLength()==out.length();
+
+    re=QRegularExpression(QStringLiteral("(/usr/bin/octopi -style )\\S+"));
+    match = re.match(out);
+    bool hasMatchInStyle = match.capturedLength()==out.length();
+
+    if (out == QLatin1String("/usr/bin/") + octoToolName ||
+        (options.indexOf(out)!=-1) ||
+        (hasMatchInSession) ||
+        (hasMatchInStyle)) res=true;
+  }
+  return res;
+}
+
+/*
+ * Executes all commands inside Octopi's SharedMemory - "octopi-helper -ts"
+ */
+int OctopiHelper::executePkgTransactionWithSharedMem()
+{
+  bool isOctopiRunning=isOctoToolRunning(QStringLiteral("octopi"));
+  bool isNotifierRunning=isOctoToolRunning(QStringLiteral("octopi-notifier"));
+  bool isCacheCleanerRunning=isOctoToolRunning(QStringLiteral("octopi-cachecle"));
+
+  if (!isOctopiRunning && !isNotifierRunning && !isCacheCleanerRunning)
+  {
+    log(QLatin1String("octopi-helper[aborted]: Suspicious execution method - NO [/usr/bin/octopi-cachecleaner] OR [/usr/bin/octopi-notifier] OR [/usr/bin/octopi] is running..."));
+    return ctn_SUSPICIOUS_EXECUTION_METHOD;
+  }
+
+  //Let's retrieve commands from sharedmem pool
+  QSharedMemory *sharedMem = new QSharedMemory(QStringLiteral("org.arnt.octopi"), this);
+  if (!sharedMem->attach(QSharedMemory::ReadOnly))
+  {
+    log(QLatin1String("octopi-helper[aborted]: Couldn't attach to memory"));
+    return ctn_COULD_NOT_ATTACH_TO_MEM;
+  }
+
+  QByteArray sharedData(sharedMem->size(), '\0');
+  sharedMem->lock();
+  memcpy(sharedData.data(), sharedMem->data(), sharedMem->size());
+  sharedMem->unlock();
+  QString contents=QString::fromLatin1(sharedData);
+  sharedMem->detach();
+  delete sharedMem;
+
+  bool suspicious = false;
+
+  if (contents.isEmpty() || contents.contains(QRegularExpression(m_suspiciousChars)))
+    suspicious = true;
+
+  if (suspicious)
+  {
+    log(QLatin1String("octopi-helper[aborted]: Suspicious transaction detected -> \"") + contents + QLatin1String("\""));
+    return ctn_SUSPICIOUS_ACTIONS_FILE;
+  }
+
+  const QStringList lines = contents.split(QStringLiteral("\n"), Qt::SkipEmptyParts);
+  bool testCommandFromOctopi=false;
+  bool testCommandFromNotifier=false;
+  bool testCommandFromCacheCleaner=false;
+
+  for(auto line : lines)
+  {
+    line = line.trimmed();
+
+    if ((line == QLatin1String("killall pacman")) ||
+      (line == QLatin1String("rm ") + ctn_PACMAN_DATABASE_LOCK_FILE) ||
+      (line == QLatin1String("echo -e")) ||
+      (line == QLatin1String("echo \"PAKtC\"")) ||
+      (line == QLatin1String("read -n 1 -p \"PAKtC\"")) ||
+      (line == QLatin1String("pkgfile -u")) ||
+      (line == QLatin1String("paccache -r -k 0")) ||
+      (line == QLatin1String("paccache -r -k 1")) ||
+      (line == QLatin1String("paccache -r -k 2")) ||
+      (line == QLatin1String("paccache -r -k 3")) ||
+      (line == QLatin1String("pacman -Fy")) ||
+      (line == QLatin1String("pacman -Syu")) ||
+      (line == QLatin1String("pacman -Syu --noconfirm")) ||
+      (line.startsWith(QLatin1String("pacman -D --asexplicit "))) ||
+      (line.startsWith(QLatin1String("pacman -D --asdeps "))) ||
+      (line.startsWith(QLatin1String("pacman -S "))) ||
+      (line.startsWith(QLatin1String("pacman -R "))))
+    {
+      if (line.startsWith(QLatin1String("pacman -D --asexplicit ")) ||
+          line.startsWith(QLatin1String("pacman -D --asdeps ")) ||
+          line.startsWith(QLatin1String("pacman -S ")) ||
+          line.startsWith(QLatin1String("pacman -R ")))
+      {
+        testCommandFromOctopi=true;
+      }
+      else if (line.startsWith(QLatin1String("pacman -Syu")))
+      {
+        testCommandFromOctopi=true;
+        testCommandFromNotifier=true;
+      }
+      else if (line.startsWith(QLatin1String("paccache -r -k")))
+      {
+        testCommandFromCacheCleaner=true;
+      }
+    }
+    else
+    {
+      suspicious = true;
+    }
+
+    if (suspicious)
+    {
+      log(QLatin1String("octopi-helper[aborted]: Suspicious transaction detected -> \"") + line + QLatin1String("\""));
+      return ctn_SUSPICIOUS_ACTIONS_FILE;
+    }
+  }
+
+  //Using full path binaries
+  contents = contents.replace(QLatin1String("killall pacman"), QLatin1String("/usr/bin/killall pacman"));
+  contents = contents.replace(QLatin1String("rm ") + ctn_PACMAN_DATABASE_LOCK_FILE, QLatin1String("/usr/bin/rm ") + ctn_PACMAN_DATABASE_LOCK_FILE);
+  contents = contents.replace(QLatin1String("pkgfile -u"), QLatin1String("/usr/bin/pkgfile -u"));
+  contents = contents.replace(QLatin1String("paccache -r"), QLatin1String("/usr/bin/paccache -r"));
+  contents = contents.replace(QLatin1String("pacman -Fy"), QLatin1String("/usr/bin/pacman -Fy"));
+  contents = contents.replace(QLatin1String("pacman -Syu"), QLatin1String("/usr/bin/pacman -Syu"));
+  contents = contents.replace(QLatin1String("pacman -D "), QLatin1String("/usr/bin/pacman -D "));
+  contents = contents.replace(QLatin1String("pacman -S "), QLatin1String("/usr/bin/pacman -S "));
+  contents = contents.replace(QLatin1String("pacman -R "), QLatin1String("/usr/bin/pacman -R "));
+
+  //If there is a "pacman" process executing elsewhere, let's abort octopi-helper!
+  if (contents != QLatin1String("/usr/bin/killall pacman\n/usr/bin/rm ") + ctn_PACMAN_DATABASE_LOCK_FILE +QLatin1Char('\n') && isAppRunning(QStringLiteral("pacman"), true))
+  {
+    log(QLatin1String("octopi-helper[aborted]: Pacman process already running"));
+    return ctn_PACMAN_PROCESS_EXECUTING;
+  }
+
+  if (testCommandFromOctopi)
+  {
+    if (!isOctopiRunning && !testCommandFromNotifier)
+    {
+      log(QLatin1String("octopi-helper[aborted]: Suspicious execution method -> Octopi not running"));
+      return ctn_SUSPICIOUS_EXECUTION_METHOD;
+    }
+
+    //Let's make a connection to Octopi server to ensure it sent this command.
+    QTcpSocket socket;
+    socket.connectToHost(QStringLiteral("127.0.0.1"), 12701);
+
+    if (!socket.waitForConnected(5000))
+    {
+      if (!testCommandFromNotifier)
+      {
+        log(QLatin1String("octopi-helper[aborted]: Timeout connecting to Octopi"));
+        return ctn_TIMEOUT_CONNECTING;
+      }
+      else goto testNotifierConnection;
+    }
+
+    QDataStream in(&socket);
+    in.setVersion(QDataStream::Qt_5_15);
+    QString octopiResponse;
+
+    do
+    {
+      if (!socket.waitForReadyRead() && !testCommandFromNotifier)
+      {
+        log(QLatin1String("octopi-helper[aborted]: Timeout contacting Octopi"));
+        return ctn_TIMEOUT_CONNECTING;
+      }
+
+      in.startTransaction();
+      in >> octopiResponse;
+    } while (!in.commitTransaction());
+
+    if (octopiResponse == QLatin1String("Octopi est occupatus"))
+    {
+      testCommandFromNotifier=false;
+    }
+    else if (octopiResponse != QLatin1String("Octopi est occupatus") && !testCommandFromNotifier)
+    {
+      log(QLatin1String("octopi-helper[aborted]: No transaction being executed"));
+      return ctn_NO_TRANSACTION_EXECUTING;
+    }
+  }
+
+  testNotifierConnection:
+  if (testCommandFromNotifier)
+  {
+    if (!isNotifierRunning)
+    {
+      log(QLatin1String("octopi-helper[aborted]: Suspicious execution method -> Notifier is not running"));
+      return ctn_SUSPICIOUS_EXECUTION_METHOD;
+    }
+
+    //Let's make a connection to Octopi-Notifier server to ensure it sent this command.
+    QTcpSocket socket;
+    socket.connectToHost(QStringLiteral("127.0.0.1"), 12702);
+
+    if (!socket.waitForConnected(5000))
+    {
+      log(QLatin1String("octopi-helper[aborted]: Timeout connecting to Octopi-Notifier"));
+      return ctn_TIMEOUT_CONNECTING;
+    }
+
+    QDataStream in(&socket);
+    in.setVersion(QDataStream::Qt_5_15);
+    QString octopiResponse;
+
+    do
+    {
+      if (!socket.waitForReadyRead())
+      {
+        log(QLatin1String("octopi-helper[aborted]: Timeout contacting Octopi-Notifier"));
+        return ctn_TIMEOUT_CONNECTING;
+      }
+
+      in.startTransaction();
+      in >> octopiResponse;
+    } while (!in.commitTransaction());
+
+    if (octopiResponse != QLatin1String("Octopi est occupatus"))
+    {
+      log(QLatin1String("octopi-helper[aborted]: No transaction being executed"));
+      return ctn_NO_TRANSACTION_EXECUTING;
+    }
+  }
+
+  if (testCommandFromCacheCleaner)
+  {
+    if (!isCacheCleanerRunning)
+    {
+      log(QLatin1String("octopi-helper[aborted]: Suspicious execution method -> CacheCleaner is not running"));
+      return ctn_SUSPICIOUS_EXECUTION_METHOD;
+    }
+
+    //Let's make a connection to Octopi-Notifier server to ensure it sent this command.
+    QTcpSocket socket;
+    socket.connectToHost(QStringLiteral("127.0.0.1"), 12703);
+
+    if (!socket.waitForConnected(5000))
+    {
+      log(QLatin1String("octopi-helper[aborted]: Timeout connecting to Octopi-CacheCleaner"));
+      return ctn_TIMEOUT_CONNECTING;
+    }
+
+    QDataStream in(&socket);
+    in.setVersion(QDataStream::Qt_5_15);
+    QString octopiResponse;
+
+    do
+    {
+      if (!socket.waitForReadyRead())
+      {
+        log(QLatin1String("octopi-helper[aborted]: Timeout contacting Octopi-CacheCleaner"));
+        return ctn_TIMEOUT_CONNECTING;
+      }
+
+      in.startTransaction();
+      in >> octopiResponse;
+    } while (!in.commitTransaction());
+
+    if (octopiResponse != QLatin1String("Octopi est occupatus"))
+    {
+      log(QLatin1String("octopi-helper[aborted]: No transaction being executed"));
+      return ctn_NO_TRANSACTION_EXECUTING;
+    }
+  }
+
+  //Let's construct the root owned execution file
+  QFile *ftemp = generateTemporaryFile();
+  QTextStream out(ftemp);
+
+  QString proxySettings = getProxySettings();
+  if (!proxySettings.isEmpty())
+  {
+    if (proxySettings.contains(QLatin1String("ftp://")))
+      out << QLatin1String("export ftp_proxy=") + proxySettings + QLatin1Char('\n');
+    else if (proxySettings.contains(QLatin1String("http://")))
+      out << QLatin1String("export http_proxy=") + proxySettings + QLatin1Char('\n');
+    else if (proxySettings.contains(QLatin1String("https://")))
+      out << QLatin1String("export https_proxy=") + proxySettings + QLatin1Char('\n');
+  }
+
+  out << QLatin1String("unalias -a\n") << contents;
+
+  log(QLatin1String("Exec as root: ") + contents.trimmed());
+
+  out.flush();
+  ftemp->close();
+
+  m_process->setProcessEnvironment(getProcessEnvironment());
+  m_process->start(getShell(), QStringList() << m_temporaryFile->fileName());
+  m_process->waitForStarted(-1);
+  m_process->waitForFinished(-1);
+
+  return m_process->exitCode();
+}

helper/octopihelper.h

@@ -0,0 +1,65 @@
+/*
+* This file is part of Octopi, an open-source GUI for pacman.
+* Copyright (C) 2019 Alexandre Albuquerque Arnt
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*
+*/
+
+#ifndef OCTOPIHELPER_H
+#define OCTOPIHELPER_H
+
+#include "../src/constants.h"
+
+#include <QString>
+#include <QProcess>
+#include <QFile>
+#include <QRandomGenerator>
+
+class OctopiHelper: QObject
+{
+Q_OBJECT
+
+private:
+  int m_exitCode;
+  QProcess *m_process;
+  QProcessEnvironment getProcessEnvironment();
+  QString m_suspiciousChars;
+  QFile m_logFile;
+
+  static QFile *m_temporaryFile;
+
+  static QString getProxySettings();
+
+  static QFile* generateTemporaryFile(){
+    quint32 gen = QRandomGenerator::global()->generate();
+    m_temporaryFile = new QFile(ctn_TEMP_ACTIONS_FILE + QString::number(gen));
+    m_temporaryFile->open(QIODevice::ReadWrite|QIODevice::Text);
+    m_temporaryFile->setPermissions(QFile::Permissions(QFile::ExeOwner|QFile::ReadOwner));
+
+    return m_temporaryFile;
+  }
+
+public:
+  OctopiHelper();
+  virtual ~OctopiHelper();
+
+  void log(const QString &str);
+  int executePkgTransactionWithSharedMem();
+  inline int getExitCode() { return m_exitCode; }
+  bool isOctoToolRunning(const QString &octoToolName);
+};
+
+#endif // OCTOPIHELPER_H

notifier/CMakeLists.txt

@@ -0,0 +1,114 @@
+option(USE_QTERMWIDGET6 "Build with qtermwidget6 instead of qtermwidget5" OFF)
+option(USE_KF5NOTIFICATIONS "Build with KF5Notifications support" OFF)
+option(USE_KF6NOTIFICATIONS "Build with KF6StatusNotifierItem support" OFF)
+
+if (USE_QTERMWIDGET6)
+  find_package(Qt6 REQUIRED COMPONENTS Core Core5Compat Xml Gui Widgets Network)
+  find_package(qtermwidget6 REQUIRED)
+else()
+  find_package(Qt5 REQUIRED COMPONENTS Core Xml Gui Widgets Network)
+  find_package(qtermwidget5 REQUIRED)
+endif()
+
+find_package(alpm_octopi_utils REQUIRED)
+
+if (USE_KF5NOTIFICATIONS)
+  find_package(KF5Notifications QUIET)
+endif()  
+
+if (USE_KF6NOTIFICATIONS)
+  find_package(KF6StatusNotifierItem QUIET)
+endif()
+
+if(USE_KF5NOTIFICATIONS AND NOT KF5Notifications_FOUND)
+    message(WARNING "KNotifications not found. Skipping")
+endif()
+
+if(USE_KF6NOTIFICATIONS AND NOT KF6StatusNotifierItem_FOUND)
+    message(WARNING "KF6StatusNotifierItem not found. Skipping")
+endif()
+
+set(CMAKE_AUTOMOC ON)
+
+set(src 
+    main.cpp
+    mainwindow.cpp
+    outputdialog.cpp
+    ../src/QtSolutions/qtsingleapplication.cpp
+    ../src/QtSolutions/qtlocalpeer.cpp
+    ../src/terminal.cpp
+    ../src/unixcommand.cpp
+    ../src/package.cpp
+    ../src/wmhelper.cpp
+    ../src/strconstants.cpp
+    ../src/settingsmanager.cpp
+    ../src/utils.cpp
+    ../src/transactiondialog.cpp
+    ../src/argumentlist.cpp
+    ../src/pacmanexec.cpp
+    ../src/searchlineedit.cpp
+    ../src/searchbar.cpp
+    ../src/optionsdialog.cpp
+    ../src/termwidget.cpp
+    ../src/aurvote.cpp
+    ../src/qaesencryption.cpp
+    ../src/alpmbackend.cpp)
+
+set(header 
+    mainwindow.h
+    outputdialog.h
+    ../src/QtSolutions/qtsingleapplication.h
+    ../src/QtSolutions/qtlocalpeer.h
+    ../src/uihelper.h
+    ../src/terminal.h
+    ../src/unixcommand.h
+    ../src/wmhelper.h
+    ../src/strconstants.h
+    ../src/package.h
+    ../src/utils.h
+    ../src/transactiondialog.h
+    ../src/argumentlist.h
+    ../src/pacmanexec.h
+    ../src/searchlineedit.h
+    ../src/searchbar.h
+    ../src/optionsdialog.h
+    ../src/termwidget.h
+    ../src/aurvote.h
+    ../src/qaesencryption.h
+    ../src/alpmbackend.h)
+
+set(ui ../ui/transactiondialog.ui ../ui/optionsdialog.ui)
+
+set(qrc ../resources.qrc)
+
+qt_wrap_ui(src ${ui})
+qt_add_resources(src ${qrc})
+
+add_executable(octopi-notifier ${src} ${header})
+target_compile_definitions(octopi-notifier PRIVATE OCTOPI_EXTENSIONS ALPM_BACKEND QT_USE_QSTRINGBUILDER QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII QT_NO_URL_CAST_FROM_STRING QT_NO_CAST_FROM_BYTEARRAY)
+
+if (USE_QTERMWIDGET6)
+  target_include_directories(octopi-notifier PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${Qt6Core_INCLUDE_DIRS} ${Qt6Xml_INCLUDE_DIRS} ${Qt6Gui_INCLUDE_DIRS} ${Qt6Network_INCLUDE_DIRS})
+  target_link_libraries(octopi-notifier PRIVATE Qt6::Core Qt6::Xml Qt6::Gui Qt6::Widgets Qt6::Network qtermwidget6 alpm_octopi_utils)
+
+  if(USE_KF6NOTIFICATIONS AND KF6StatusNotifierItem_FOUND)
+    target_compile_definitions(octopi-notifier PRIVATE KSTATUS)
+    find_package(Qt6 REQUIRED COMPONENTS DBus)
+    target_include_directories(octopi-notifier PRIVATE ${Qt6DBus_INCLUDE_DIRS})
+    target_link_libraries(octopi-notifier PRIVATE Qt6::DBus KF6::StatusNotifierItem)
+  endif()
+else()
+  target_include_directories(octopi-notifier PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${Qt5Core_INCLUDE_DIRS} ${Qt5Xml_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS})
+  target_link_libraries(octopi-notifier PRIVATE Qt5::Core Qt5::Xml Qt5::Gui Qt5::Widgets Qt5::Network qtermwidget5 alpm_octopi_utils)
+
+  if(USE_KF5NOTIFICATIONS AND KF5Notifications_FOUND)
+    target_compile_definitions(octopi-notifier PRIVATE KSTATUS)
+    find_package(Qt5 REQUIRED COMPONENTS DBus)
+    target_include_directories(octopi-notifier PRIVATE ${Qt5DBus_INCLUDE_DIRS})
+    target_link_libraries(octopi-notifier PRIVATE Qt5::DBus KF5::Notifications)
+  endif()
+endif()
+
+install(TARGETS octopi-notifier RUNTIME DESTINATION bin LIBRARY DESTINATION lib PUBLIC_HEADER DESTINATION include)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/octopi-notifier.desktop" DESTINATION share/applications)
+#install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/octopi-notifier.desktop" DESTINATION /etc/xdg/autostart)

notifier/main.cpp

@@ -0,0 +1,137 @@
+/*
+* This file is part of Octopi, an open-source GUI for pacman.
+* Copyright (C) 2013 Alexandre Albuquerque Arnt
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*
+*/
+
+#include "../src/unixcommand.h"
+#include "../src/wmhelper.h"
+#include "../src/strconstants.h"
+#include "../src/argumentlist.h"
+#include "mainwindow.h"
+
+#include "../src/QtSolutions/qtsingleapplication.h"
+//#include <QApplication>
+#include <QtGui>
+#include <QMessageBox>
+#include <QDebug>
+
+#define NO_GTK_STYLE
+
+int main(int argc, char *argv[])
+{  
+  bool debugInfo = false;
+
+  ArgumentList *argList = new ArgumentList(argc, argv);
+  if (argList->getSwitch(QStringLiteral("-d")))
+  {
+    //If user chooses to switch debug info on...
+    debugInfo = true;
+  }
+
+  if (debugInfo)
+    qDebug() << QString(QLatin1String("Octopi Notifier - ") + ctn_APPLICATION_VERSION +
+                  QLatin1String(" (") + StrConstants::getQtVersion() + QLatin1String(")"));
+
+  /*if (UnixCommand::isAppRunning(QStringLiteral("octopi-notifier")))
+  {
+    qDebug() << "Aborting notifier as another instance is already running!";
+    return (-1);
+  }*/
+
+  if (!QFile::exists(ctn_CHECKUPDATES_BINARY))
+  {
+    qDebug() << "Aborting notifier as 'checkupdates' binary could not be found! [" << ctn_CHECKUPDATES_BINARY << "]";
+    return (-2);
+  }
+
+  if (!QFile::exists(ctn_OCTOPI_HELPER_PATH))
+  {
+    qDebug() << "Aborting notifier as 'octphelper' binary could not be found! [" << ctn_OCTOPI_HELPER_PATH << "]";
+    return (-3);
+  }
+
+  if (!QFile::exists(ctn_OCTOPISUDO))
+  {
+    qDebug() << "Aborting notifier as 'qt-sudo' binary could not be found! [" << ctn_OCTOPISUDO << "]";
+    return (-4);
+  }
+
+  //QApplication a(argc, argv);
+  QtSingleApplication a(QLatin1String("NotifierOcto"), argc, argv);
+
+  if (a.isRunning())
+  {
+    if (argList->getSwitch(QStringLiteral("-checkupdates")))
+    {
+      a.sendMessage(QStringLiteral("NOTIFIER_CHECKUPDATES"));
+    }
+
+    return 0;
+  }
+  else if (argList->getSwitch(QStringLiteral("-checkupdates")))
+  {
+    return -7; //We are not running, so nothing to check...
+  }
+
+  QTranslator appTranslator;
+  appTranslator.load(QLatin1String(":/resources/translations/octopi_") +
+                     QLocale::system().name());
+  a.installTranslator(&appTranslator);
+  a.setQuitOnLastWindowClosed(false);
+
+  if (!UnixCommand::isOctoToolRunning(QStringLiteral("octopi-notifier")))
+  {
+    QMessageBox::critical(nullptr, StrConstants::getApplicationName(), StrConstants::getErrorRunOctopiNotifierAsUsrBin());
+    return (-6);
+  }
+
+  if (UnixCommand::isRootRunning()){
+    QMessageBox::critical(nullptr, StrConstants::getApplicationName(), StrConstants::getErrorRunningWithRoot());
+    return (-5);
+  }
+
+  unsetenv("TMPDIR");
+
+  setenv("COLORTERM", "truecolor", 1);
+  setenv("TERM", "xterm-256color", 1);
+
+  QString buildDir=SettingsManager::getAURBuildDir();
+  if (!buildDir.isEmpty())
+  {
+    setenv("BUILDDIR", buildDir.toLatin1().data(), 1);
+  }
+
+  MainWindow w;
+
+  QObject::connect(&a, SIGNAL(notifierCheckUpdates()), &w, SLOT(doCheckUpdates()));
+
+  a.setActivationWindow(&w);
+  a.setQuitOnLastWindowClosed(false);
+
+  if (w.startServer())
+  {
+    QResource::registerResource(QStringLiteral("./resources.qrc"));
+
+    QGuiApplication::setDesktopFileName(QStringLiteral("octopi-notifier"));
+
+    if (debugInfo)
+      w.turnDebugInfoOn();
+
+    return a.exec();
+  }
+}

notifier/mainwindow.h

@@ -21,8 +21,8 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include "../../src/unixcommand.h"
-#include "../../src/pacmanexec.h"
+#include "../src/unixcommand.h"
+#include "../src/pacmanexec.h"
 
 #include <QDialog>
 #include <QProcess>
@@ -34,9 +34,12 @@ class QIcon;
 class QMenu;
 class QAction;
 class QFileSystemWatcher;
-class PacmanHelperClient;
 class OptionsDialog;
 class TransactionDialog;
+class QTcpServer;
+class OutputDialog;
+
+enum CheckUpdate { ectn_AUTO_CHECK, ectn_USER_CHECK};
 
 #ifdef KSTATUS
   class KStatusNotifierItem;
@@ -47,23 +50,27 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-
-  explicit MainWindow(QWidget *parent = 0);
+  explicit MainWindow(QWidget *parent = nullptr);
   virtual ~MainWindow();
+
   inline void turnDebugInfoOn() { m_debugInfo = true;}
+  bool startServer();
+
+public slots:
+  void doCheckUpdates(CheckUpdate check = ectn_USER_CHECK);
 
 private slots:
-
   void pacmanHelperTimerTimeout();
-  void afterPacmanHelperSyncDatabase();
+  void afterCheckUpdates(int exitCode, QProcess::ExitStatus);
 
   void execSystemTrayActivated(QSystemTrayIcon::ActivationReason);
   void execSystemTrayKF5();
 
-  void syncDatabase();
+  void refreshOutdatedPkgsTooltip();
   void refreshAppIcon();
   void runOctopi(ExecOpt execOptions = ectn_SYSUPGRADE_EXEC_OPT);
-  void runOctopiSysUpgrade();  
+  void runOctopiCheckUpdates();
+  void runOctopiSysUpgrade();
   void runOctopiAURUpgrade();
 
   inline void startOctopi() { runOctopi(ectn_NORMAL_EXEC_OPT); }
@@ -73,35 +80,44 @@ private slots:
   void exitNotifier();
   void doSystemUpgrade();
   void doAURUpgrade();
-  void doSystemUpgradeFinished();
+  void doSystemUpgradeFinished(int exitCode);
   void toggleEnableInterface(bool state);
   void showOptionsDialog();
+  void onSendInfoToOctopiHelper();
+  void onCallRefreshAppIcon();
 
 private:
-
-  TransactionDialog *m_transactionDialog;
-  OptionsDialog *m_optionsDialog;
+  bool m_debugInfo;
+  int m_numberOfCheckUpdatesPackages;
   int m_numberOfOutdatedPackages;
   int m_numberOfOutdatedAURPackages;
   bool m_systemUpgradeDialog;
+  bool isOctopiBusy();
+  bool canOctopiUpgrade();
+
   CommandExecuting m_commandExecuting;
   UnixCommand *m_unixCommand;
-
+  PacmanExec *m_pacmanExec;
+  TransactionDialog *m_transactionDialog;
+  OptionsDialog *m_optionsDialog;
+  QTcpServer *m_tcpServer;
   QAction *m_actionOctopi;
   QAction *m_actionOptions;
-  QAction *m_actionSyncDatabase;
+  QAction *m_actionCheckUpdates;
   QAction *m_actionSystemUpgrade;
   QAction *m_actionAURUpgrade;
   QAction *m_actionAbout;
   QAction *m_actionExit;
-
-  PacmanExec *m_pacmanExec;
-
   QIcon m_icon;
+  QHash<QString, QString> *m_checkUpdatesNameNewVersion;
+  QStringList m_checkUpdatesStringList;
   QStringList *m_outdatedStringList;
   QStringList *m_outdatedAURStringList;
   QTimer *m_pacmanHelperTimer;
-  bool m_debugInfo;
+  QTimer *m_callRefreshAppIcon;
+  QMenu *m_systemTrayIconMenu;
+  QFileSystemWatcher *m_pacmanDatabaseSystemWatcher;
+  OutputDialog *m_outputDialog;
 
 #ifdef KSTATUS
   KStatusNotifierItem * m_systemTrayIcon;
@@ -109,15 +125,11 @@ private:
   QSystemTrayIcon *m_systemTrayIcon;
 #endif
 
-  QMenu *m_systemTrayIconMenu;
-  QFileSystemWatcher *m_pacmanDatabaseSystemWatcher;
-  PacmanHelperClient *m_pacmanHelperClient;
-
   bool _isSUAvailable();
   bool isInternetAvailable();
   void initActions();
   void initSystemTrayIcon();
-  void sendNotification(const QString &msg);
+  void setUpgradingTooltip();
 };
 
 #endif // MAINWINDOW_H

notifier/octopi-notifier.desktop

@@ -1,10 +1,12 @@
 [Desktop Entry]
 Name=Octopi Notifier
 Icon=octopi
-Exec=octopi-notifier
+Exec=/usr/bin/octopi-notifier
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;System;
 #NotShowIn=GNOME;XFCE;LXDE;KDE;
 StartupNotify=true
 X-LXQt-Need-Tray=true
+Version=1.5
+SingleMainWindow=true

notifier/octopi-notifier.pro

@@ -0,0 +1,136 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2013-07-20T16:15:14
+#
+#-------------------------------------------------
+
+QT += core xml gui network
+
+DEFINES += OCTOPI_EXTENSIONS ALPM_BACKEND
+
+# Disable automatic string conversions
+DEFINES += QT_USE_QSTRINGBUILDER \
+           QT_NO_CAST_FROM_ASCII \
+           QT_NO_CAST_TO_ASCII \
+           QT_NO_URL_CAST_FROM_STRING \
+           QT_NO_CAST_FROM_BYTEARRAY
+
+CONFIG += qt warn_on debug link_pkgconfig ALPM_BACKEND USE_QTERMWIDGET6
+
+ALPM_BACKEND {
+  QMAKE_CXXFLAGS += -std=c++17
+  PKGCONFIG += glib-2.0 libalpm
+  LIBS += -lalpm_octopi_utils
+} else {
+  QMAKE_CXXFLAGS += -std=c++17
+}
+
+USE_QTERMWIDGET6 {
+  LIBS += -lqtermwidget6
+  QT += core5compat
+} else {
+  LIBS += -lqtermwidget5
+}
+
+#contains(DEFINES, KSTATUS){
+#  QT += dbus
+#}
+
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+
+CONFIG += qt console warn_on debug
+QMAKE_CXXFLAGS += -std=c++17
+TARGET = octopi-notifier
+TEMPLATE = app
+DESTDIR += ./bin
+OBJECTS_DIR += ./build
+MOC_DIR += ./build
+UI_DIR += ./build
+
+HEADERS  += \
+    mainwindow.h \
+    outputdialog.h \
+    ../src/QtSolutions/qtsingleapplication.h \
+    ../src/QtSolutions/qtlocalpeer.h \
+    ../src/uihelper.h \
+    ../src/terminal.h \
+    ../src/unixcommand.h \
+    ../src/wmhelper.h \
+    ../src/strconstants.h \
+    ../src/package.h \
+    ../src/utils.h \
+    ../src/transactiondialog.h \
+    ../src/argumentlist.h \
+    ../src/pacmanexec.h \
+    ../src/searchlineedit.h \
+    ../src/searchbar.h \
+    ../src/optionsdialog.h \
+    ../src/termwidget.h \
+    ../src/aurvote.h \
+    ../src/qaesencryption.h
+
+ALPM_BACKEND{
+  HEADERS += ../src/alpmbackend.h
+}
+
+SOURCES += main.cpp \
+    mainwindow.cpp \
+    outputdialog.cpp \
+    ../src/QtSolutions/qtsingleapplication.cpp \
+    ../src/QtSolutions/qtlocalpeer.cpp \
+    ../src/terminal.cpp \
+    ../src/unixcommand.cpp \
+    ../src/package.cpp \
+    ../src/wmhelper.cpp \
+    ../src/strconstants.cpp \
+    ../src/settingsmanager.cpp \
+    ../src/utils.cpp \
+    ../src/transactiondialog.cpp \
+    ../src/argumentlist.cpp \
+    ../src/pacmanexec.cpp \
+    ../src/searchlineedit.cpp \
+    ../src/searchbar.cpp \
+    ../src/optionsdialog.cpp \
+    ../src/termwidget.cpp \
+    ../src/aurvote.cpp \
+    ../src/qaesencryption.cpp
+
+ALPM_BACKEND{
+  SOURCES += ../src/alpmbackend.cpp
+}
+
+FORMS += ../ui/transactiondialog.ui \
+    ../ui/optionsdialog.ui
+
+RESOURCES += \
+    ../resources.qrc
+    
+# install
+isEmpty(PREFIX) {
+    PREFIX = /usr
+}
+ 
+isEmpty(BINDIR) {
+    BINDIR = $$PREFIX/bin
+}
+
+isEmpty(DATADIR) {
+    DATADIR = $$PREFIX/share
+}
+
+isEmpty(ETCDIR) {
+    ETCDIR = /etc
+}
+    
+target.path = $$BINDIR
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro 
+sources.path = .
+
+#autostart.path = $$ETCDIR/xdg/autostart
+#autostart.files += octopi-notifier.desktop
+
+desktop.path = $$DATADIR/applications
+desktop.files += octopi-notifier.desktop
+
+#INSTALLS += target autostart desktop
+INSTALLS += target desktop

notifier/octopi-notifier/main.cpp

@@ -1,81 +0,0 @@
-/*
-* This file is part of Octopi, an open-source GUI for pacman.
-* Copyright (C) 2013 Alexandre Albuquerque Arnt
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*
-*/
-
-#include "../../src/unixcommand.h"
-#include "../../src/wmhelper.h"
-#include "../../src/strconstants.h"
-#include "../../src/argumentlist.h"
-#include "mainwindow.h"
-
-#include <QApplication>
-#include <QtGui>
-#include <QDebug>
-
-#define NO_GTK_STYLE
-
-int main(int argc, char *argv[])
-{  
-  bool debugInfo = false;
-
-  ArgumentList *argList = new ArgumentList(argc, argv);
-  if (argList->getSwitch("-d"))
-  {
-    //If user chooses to switch debug info on...
-    debugInfo = true;
-  }
-
-  if (debugInfo)
-    qDebug() << QString("Octopi Notifier - " + StrConstants::getApplicationVersion() +
-                  " (" + StrConstants::getQtVersion() + ")");
-
-  if (UnixCommand::isAppRunning("octopi-notifier"))
-  {
-    qDebug() << "Aborting notifier as another instance is already running!";
-    return (-1);
-  }
-
-  if (!QFile::exists(ctn_PACMANHELPER_BINARY))
-  {
-    qDebug() << "Aborting notifier as 'pacmanhelper' binary could not be found! [" << ctn_PACMANHELPER_BINARY << "]";
-    return (-2);
-  }
-
-  if (!QFile::exists(ctn_DBUS_PACMANHELPER_SERVICE))
-  {
-    qDebug() << "Aborting notifier as 'pacmanhelper' DBus service could not be found! [" << ctn_DBUS_PACMANHELPER_SERVICE << "]";
-    return (-3);
-  }
-
-  QApplication a(argc, argv);
-  QTranslator appTranslator;
-  appTranslator.load(":/resources/translations/octopi_" +
-                     QLocale::system().name());
-
-  a.installTranslator(&appTranslator);
-  a.setQuitOnLastWindowClosed(false);
-
-  MainWindow w;
-  QResource::registerResource("./resources.qrc");
-
-  if (debugInfo)
-    w.turnDebugInfoOn();
-
-  return a.exec();
-}

notifier/octopi-notifier/octopi-notifier.pro

@@ -1,126 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2013-07-20T16:15:14
-#
-#-------------------------------------------------
-
-QT += core xml gui network dbus
-
-# This controls whether octopi-notifier uses KStatusNotifier lib
-# You SHOULD REALLY enable KSTATUS define in plasma 5 desktops!
-DEFINES += ALPM_BACKEND QTERMWIDGET #KSTATUS
-CONFIG += qt warn_on debug link_pkgconfig ALPM_BACKEND QTERMWIDGET
-
-ALPM_BACKEND {
-  QMAKE_CXXFLAGS += -std=c++11
-  PKGCONFIG += glib-2.0 libalpm
-  LIBS += -lalpm_octopi_utils
-} else {
-  QMAKE_CXXFLAGS += -std=c++11
-}
-
-QTERMWIDGET {
-  LIBS += -lqtermwidget5
-}
-
-contains(DEFINES, KSTATUS){
-  QT += KNotifications
-}
-
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
-
-CONFIG += qt console warn_on debug
-QMAKE_CXXFLAGS += -std=c++11
-TARGET = octopi-notifier
-TEMPLATE = app
-DESTDIR += ../bin
-OBJECTS_DIR += ../build-octopi-notifier
-MOC_DIR += ../build-octopi-notifier
-UI_DIR += ../build-octopi-notifier
-
-HEADERS  += \
-    mainwindow.h \
-    outputdialog.h \
-    ../../src/uihelper.h \
-    ../../src/terminal.h \
-    ../../src/unixcommand.h \
-    ../../src/wmhelper.h \
-    ../../src/strconstants.h \
-    ../../src/package.h \
-    ../pacmanhelper/pacmanhelperclient.h \
-    ../../src/utils.h \
-    ../../src/transactiondialog.h \
-    ../../src/argumentlist.h \
-    ../../src/pacmanexec.h \
-    ../../src/searchlineedit.h \
-    ../../src/searchbar.h \
-    ../../src/optionsdialog.h
-
-QTERMWIDGET{
-  HEADERS += ../../src/termwidget.h
-}
-
-ALPM_BACKEND{
-  HEADERS += ../../src/alpmbackend.h
-}
-
-SOURCES += main.cpp \
-    mainwindow.cpp \
-    outputdialog.cpp \
-    ../../src/terminal.cpp \
-    ../../src/unixcommand.cpp \
-    ../../src/package.cpp \
-    ../../src/wmhelper.cpp \
-    ../../src/strconstants.cpp \
-    ../../src/settingsmanager.cpp \
-    ../pacmanhelper/pacmanhelperclient.cpp \
-    ../../src/utils.cpp \
-    ../../src/transactiondialog.cpp \
-    ../../src/argumentlist.cpp \
-    ../../src/pacmanexec.cpp \
-    ../../src/searchlineedit.cpp \
-    ../../src/searchbar.cpp \
-    ../../src/optionsdialog.cpp
-
-QTERMWIDGET{
-  SOURCES += ../../src/termwidget.cpp
-}
-
-ALPM_BACKEND{
-  SOURCES += ../../src/alpmbackend.cpp
-}
-
-FORMS += ../../ui/transactiondialog.ui \
-    ../../ui/optionsdialog.ui
-
-RESOURCES += \
-    ../../resources.qrc
-    
-# install
-isEmpty(PREFIX) {
-    PREFIX = /usr
-}
- 
-isEmpty(BINDIR) {
-    BINDIR = $$PREFIX/bin
-}
-
-isEmpty(DATADIR) {
-    DATADIR = $$PREFIX/share
-}
-
-isEmpty(ETCDIR) {
-    ETCDIR = /etc
-}
-    
-target.path = $$BINDIR
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro 
-sources.path = .
-
-autostart.path = $$ETCDIR/xdg/autostart
-autostart.files += octopi-notifier.desktop
-
-desktop.path = $$DATADIR/applications
-desktop.files += octopi-notifier.desktop
-
-INSTALLS += target autostart desktop

notifier/outputdialog.cpp

@@ -19,14 +19,12 @@
 */
 
 #include "outputdialog.h"
-#include "../../src/pacmanexec.h"
-#include "../../src/searchbar.h"
-#include "../../src/uihelper.h"
-#include "../../src/strconstants.h"
-
-#ifdef QTERMWIDGET
-  #include "../../src/termwidget.h"
-#endif
+#include "../src/pacmanexec.h"
+#include "../src/searchbar.h"
+#include "../src/uihelper.h"
+#include "../src/utils.h"
+#include "../src/strconstants.h"
+#include "../src/termwidget.h"
 
 #include <QTextBrowser>
 #include <QVBoxLayout>
@@ -45,8 +43,11 @@
  */
 OutputDialog::OutputDialog(QWidget *parent): QDialog(parent)
 {
+  m_exitCode = 0;
   m_upgradeRunning = false;
   m_debugInfo = false;
+  m_AURUpgradeExecuting = false;
+  m_sharedMemory = new QSharedMemory(QStringLiteral("org.arnt.octopi"), this);
 }
 
 /*
@@ -68,9 +69,9 @@ void OutputDialog::setListOfAURPackagesToUpgrade(const QString &list)
 /*
  * Controls if this dialog was called for Pacman or AUR upgrade
  */
-void OutputDialog::setPacmanSystemUpgrade(bool value)
+void OutputDialog::setViewAsTextBrowser(bool value)
 {
-  m_pacmanSystemUpgrade = value;
+  m_viewAsTextBrowser = value;
 }
 
 /*
@@ -79,7 +80,6 @@ void OutputDialog::setPacmanSystemUpgrade(bool value)
 void OutputDialog::initAsTextBrowser()
 {
   this->resize(650, 500);
-
   setWindowTitle(QCoreApplication::translate("MainWindow", "System upgrade"));
   setWindowIcon(IconHelper::getIconSystemUpgrade());
 
@@ -122,11 +122,8 @@ void OutputDialog::initAsTextBrowser()
   m_progressBar->setMaximum(100);
   m_progressBar->setValue(0);
   m_progressBar->close();
-  //m_searchBar->show();
 }
 
-#ifdef QTERMWIDGET
-
 /*
  * Let's build the main widgets for AUR Upgrade...
  */
@@ -138,12 +135,29 @@ void OutputDialog::initAsTermWidget()
 
   m_mainLayout = new QVBoxLayout(this);
   m_console = new TermWidget(this);
-  //connect(m_console, SIGNAL(finished()), this, SLOT(initAsTermWidget()));
   m_mainLayout->addWidget(m_console);
+
   m_mainLayout->setSpacing(0);
   m_mainLayout->setSizeConstraint(QLayout::SetMinimumSize);
   m_mainLayout->setContentsMargins(2, 2, 2, 2);
-  m_console->setFocus();
+  m_console->setFocus();  
+  //m_console->toggleShowSearchBar();
+
+  m_console->installEventFilter(this);
+}
+
+/*
+ * When user wants to upgrade system using a terminal
+ */
+void OutputDialog::doSystemUpgradeInTerminal()
+{
+  m_pacmanExec = new PacmanExec(this);
+  m_pacmanExec->setSharedMemory(m_sharedMemory);
+
+  QObject::connect(m_pacmanExec, SIGNAL(commandToExecInQTermWidget(QString)), this,
+                   SLOT(onExecCommandInTabTerminal(QString)));
+  m_upgradeRunning = true;
+  m_pacmanExec->doSystemUpgradeInTerminal();
 }
 
 /*
@@ -151,7 +165,9 @@ void OutputDialog::initAsTermWidget()
  */
 void OutputDialog::doAURUpgrade()
 {
-  m_pacmanExec = new PacmanExec();
+  m_AURUpgradeExecuting=true;
+  m_pacmanExec = new PacmanExec(this);
+  m_pacmanExec->setSharedMemory(m_sharedMemory);
   QObject::connect(m_pacmanExec, SIGNAL(commandToExecInQTermWidget(QString)), this,
                    SLOT(onExecCommandInTabTerminal(QString)));
   m_upgradeRunning = true;
@@ -165,11 +181,11 @@ void OutputDialog::onExecCommandInTabTerminal(QString command)
 {
   disconnect(m_console, SIGNAL(onPressAnyKeyToContinue()), this, SLOT(onPressAnyKeyToContinue()));
   disconnect(m_console, SIGNAL(onCancelControlKey()), this, SLOT(onCancelControlKey()));
+  disconnect(m_console, SIGNAL(onKeyQuit()), this, SLOT(reject()));
   connect(m_console, SIGNAL(onPressAnyKeyToContinue()), this, SLOT(onPressAnyKeyToContinue()));
   connect(m_console, SIGNAL(onCancelControlKey()), this, SLOT(onCancelControlKey()));
+  connect(m_console, SIGNAL(onKeyQuit()), this, SLOT(reject()));
 
-  m_console->enter();
-  m_console->execute("clear");
   m_console->execute(command);
   m_console->setFocus();
 }
@@ -179,16 +195,14 @@ void OutputDialog::onExecCommandInTabTerminal(QString command)
  */
 void OutputDialog::onPressAnyKeyToContinue()
 {
-  m_console->enter();
-  m_console->execute("clear");
   m_console->setFocus();
 
   if (!m_upgradeRunning) return;
-  if (m_pacmanExec == nullptr)
+  
     delete m_pacmanExec;
 
+  if (m_sharedMemory->isAttached()) m_sharedMemory->detach();
   m_upgradeRunning = false;
-  reject();
 }
 
 /*
@@ -198,23 +212,25 @@ void OutputDialog::onCancelControlKey()
 {
   if (m_upgradeRunning)
   {
-    if (m_pacmanExec == nullptr)
+    
       delete m_pacmanExec;
 
+    if (m_sharedMemory->isAttached()) m_sharedMemory->detach();
     m_pacmanExec = nullptr;
     m_upgradeRunning = false;
-    reject();
   }
 }
 
-#endif
-
 /*
  * Calls PacmanExec to begin system upgrade
  */
 void OutputDialog::doSystemUpgrade()
 {
-  m_pacmanExec = new PacmanExec();
+  //Is pacman being executed?
+  if (UnixCommand::isPacmanDbLocked()) return;
+
+  m_pacmanExec = new PacmanExec(this);
+  m_pacmanExec->setSharedMemory(m_sharedMemory);
 
   if (m_debugInfo)
     m_pacmanExec->setDebugMode(true);
@@ -230,27 +246,29 @@ void OutputDialog::doSystemUpgrade()
   m_pacmanExec->doSystemUpgrade();
 }
 
+/*
+ * Make the shared memory available again
+ */
+void OutputDialog::detachSharedMemory()
+{
+  m_sharedMemory->detach();
+}
+
 /*
  * Centers the dialog in the screen
  */
 void OutputDialog::show()
 {
   //If we are asking for a Pacman system upgrade...
-  if (m_pacmanSystemUpgrade) initAsTextBrowser();
-#ifdef QTERMWIDGET
-  else initAsTermWidget();
-#endif
+  if (m_viewAsTextBrowser)
+    initAsTextBrowser();
+  else
+    initAsTermWidget();
 
-  //utils::positionWindowAtScreenCenter(this);
   //Let's restore the dialog size saved...
   restoreGeometry(SettingsManager::getOutputDialogWindowSize());
 
   QDialog::show();
-
-  if (m_pacmanSystemUpgrade) doSystemUpgrade();
-#ifdef QTERMWIDGET
-  else doAURUpgrade();
-#endif
 }
 
 /*
@@ -263,6 +281,8 @@ void OutputDialog::reject()
     //Let's save the dialog size value before closing it.
     QByteArray windowSize=saveGeometry();
     SettingsManager::setOutputDialogWindowSize(windowSize);
+
+    emit finished(m_exitCode);
     QDialog::reject();
   }
 }
@@ -323,19 +343,35 @@ bool OutputDialog::textInTabOutput(const QString& findText)
  */
 void OutputDialog::pacmanProcessFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
+  m_exitCode = exitCode;
+
   m_progressBar->close();
   if (SettingsManager::getShowStopTransaction()) m_toolButtonStopTransaction->close();
 
   if ((exitCode == 0) && exitStatus == QProcess::NormalExit)
   {
-    writeToTabOutput("<br><b>" + StrConstants::getCommandFinishedOK() + "</b><br>");
+    //If there are .pacnew files to print...
+    QStringList dotPacnewFiles = m_pacmanExec->getDotPacnewFileList();
+    if (dotPacnewFiles.count() > 0)
+    {
+      writeToTabOutput(QStringLiteral("<br>"));
+      foreach(QString dotPacnewFile, dotPacnewFiles)
+      {
+        if (!dotPacnewFile.contains(QLatin1String("<br>")))
+          writeToTabOutput( QLatin1String("<br>") + dotPacnewFile, ectn_DONT_TREAT_URL_LINK);
+        else
+          writeToTabOutput(dotPacnewFile, ectn_DONT_TREAT_URL_LINK);
+      }
+    }
+
+    writeToTabOutput(QLatin1String("<br><b>") + StrConstants::getCommandFinishedOK() + QLatin1String("</b><br>"));
   }
   else
   {
-    writeToTabOutput("<br><b>" + StrConstants::getCommandFinishedWithErrors() + "</b><br>");
+    writeToTabOutput(QLatin1String("<br><b>") + StrConstants::getCommandFinishedWithErrors() + QLatin1String("</b><br>"));
   }
 
-  if (exitCode != 0 && (textInTabOutput("conflict"))) //|| _textInTabOutput("could not satisfy dependencies")))
+  if (exitCode != 0 && (textInTabOutput(QStringLiteral("conflict")))) //|| _textInTabOutput("could not satisfy dependencies")))
   {
     int res = QMessageBox::question(this, StrConstants::getThereHasBeenATransactionError(),
                                     StrConstants::getConfirmExecuteTransactionInTerminal(),
@@ -343,12 +379,13 @@ void OutputDialog::pacmanProcessFinished(int exitCode, QProcess::ExitStatus exit
 
     if (res == QMessageBox::Yes)
     {
-      m_pacmanExec->runLastestCommandInTerminal();
+      m_pacmanExec->runLatestCommandInTerminal();
       return;
     }
   }
 
   delete m_pacmanExec;
+  if (m_sharedMemory->isAttached()) m_sharedMemory->detach();
   m_upgradeRunning = false;
 }
 
@@ -357,16 +394,30 @@ void OutputDialog::pacmanProcessFinished(int exitCode, QProcess::ExitStatus exit
  */
 void OutputDialog::onCanStopTransaction(bool yesNo)
 {
-  if (yesNo == true && m_progressBar->isHidden()) return;
+  if (yesNo && m_progressBar->isHidden()) return;
   if (SettingsManager::getShowStopTransaction()) m_toolButtonStopTransaction->setVisible(yesNo);
 }
 
 /*
  * Kills all pacman processes
+ *
+ * Returns qt-sudo exit code
  */
-void OutputDialog::stopTransaction()
+int OutputDialog::stopTransaction()
 {
-  m_pacmanExec->cancelProcess();
+  int res=0;
+
+  if (!m_AURUpgradeExecuting)
+  {
+    res=m_pacmanExec->cancelProcess();
+  }
+
+  if (res != 1)
+  {
+    if (m_sharedMemory->isAttached()) m_sharedMemory->detach();
+  }
+
+  return res;
 }
 
 /*
@@ -409,12 +460,38 @@ void OutputDialog::closeEvent(QCloseEvent *event)
   //We cannot quit while there is a running transaction!
   if(m_upgradeRunning)
   {
-    event->ignore();
+    int res = QMessageBox::question(this, StrConstants::getConfirmation(),
+                          StrConstants::getThereIsARunningTransaction() + QLatin1Char('\n') +
+                          StrConstants::getDoYouReallyWantToQuit(),
+                          QMessageBox::Yes | QMessageBox::No,
+                          QMessageBox::No);
+    if (res == QMessageBox::Yes)
+    {
+      if (m_viewAsTextBrowser)
+      {
+        int ret=stopTransaction();
+        if (ret == 1)
+        {
+          event->ignore();
+          return;
+        }
+      }
+
+      if (m_sharedMemory->isAttached()) m_sharedMemory->detach();
+      m_upgradeRunning = false;
+      reject();
+    }
+    else
+    {
+      event->ignore();
+    }
   }
   else
   {
+    emit finished(m_exitCode);
     event->accept();
-    emit finished(0);
+    //Let's save window size...
+    reject();
   }
 }
 
@@ -429,7 +506,78 @@ void OutputDialog::keyPressEvent(QKeyEvent *ke)
   }
   else if(ke->key() == Qt::Key_Escape)
   {
-    reject();
+    if (m_upgradeRunning)
+    {
+      int res = QMessageBox::question(this, StrConstants::getConfirmation(),
+                          StrConstants::getThereIsARunningTransaction() + QLatin1Char('\n') +
+                          StrConstants::getDoYouReallyWantToQuit(),
+                          QMessageBox::Yes | QMessageBox::No,
+                          QMessageBox::No);
+      if (res == QMessageBox::Yes)
+      {
+        if (m_viewAsTextBrowser)
+        {
+          int ret=stopTransaction();
+          if (ret == 1)
+          {
+            ke->ignore();
+            return;
+          }
+        }
+
+        m_upgradeRunning = false;
+        reject();
+      }
+      else
+      {
+        ke->ignore();
+      }
+    }
+    else reject();
   }
   else ke->accept();
 }
+
+/*
+ * Filters keypressevents from Console
+ */
+bool OutputDialog::eventFilter(QObject *, QEvent *event)
+{
+  if(event->type() == QKeyEvent::KeyRelease)
+  {
+    QKeyEvent *ke = static_cast<QKeyEvent*>(event);
+    if (ke->key() == Qt::Key_Escape)
+    {
+      if (m_upgradeRunning)
+      {
+        int res = QMessageBox::question(this, StrConstants::getConfirmation(),
+                                        StrConstants::getThereIsARunningTransaction() + QLatin1Char('\n') +
+                                        StrConstants::getDoYouReallyWantToQuit(),
+                                        QMessageBox::Yes | QMessageBox::No,
+                                        QMessageBox::No);
+        if (res == QMessageBox::Yes)
+        {
+          m_upgradeRunning = false;
+          reject();
+          return true;
+        }
+        else
+        {
+          ke->ignore();
+          return true;
+        }
+      }
+      else
+      {
+        reject();
+        return true;
+      }
+    }
+    else if(ke->key() == Qt::Key_F && ke->modifiers() == Qt::ControlModifier)
+    {
+      m_console->toggleShowSearchBar();
+    }
+  }
+
+  return false;
+}

notifier/outputdialog.h

@@ -21,7 +21,7 @@
 #ifndef OUTPUTDIALOG_H
 #define OUTPUTDIALOG_H
 
-#include "../../src/constants.h"
+#include "../src/constants.h"
 
 #include <QDialog>
 #include <QProcess>
@@ -39,6 +39,7 @@ class QCloseEvent;
 class QKeyEvent;
 class QToolButton;
 class TermWidget;
+class QSharedMemory;
 
 class OutputDialog : public QDialog
 {
@@ -53,35 +54,29 @@ private:
   SearchBar *m_searchBar;
   TermWidget *m_console;
   QString m_listOfAURPackagesToUpgrade;
+
+  int  m_exitCode;
   bool m_upgradeRunning;
   bool m_debugInfo;
-  bool m_pacmanSystemUpgrade;
+  bool m_viewAsTextBrowser;
+
+  bool m_AURUpgradeExecuting;
 
   QAction *m_actionStopTransaction;
   QToolButton *m_toolButtonStopTransaction;
+  QSharedMemory *m_sharedMemory;
 
   void initAsTextBrowser();
-  void doSystemUpgrade();
-
   void positionTextEditCursorAtEnd();
   bool textInTabOutput(const QString& findText);
   void writeToTabOutput(const QString &msg, TreatURLLinks treatURLLinks = ectn_TREAT_URL_LINK);
 
 private slots:
-
-#ifdef QTERMWIDGET
-  void initAsTermWidget();
-  void doAURUpgrade();
-  void onExecCommandInTabTerminal(QString command);
-  void onPressAnyKeyToContinue();
-  void onCancelControlKey();
-#endif
-
   void onPencertange(int percentage);
   void onWriteOutput(const QString &output);
   void pacmanProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
   void onCanStopTransaction(bool yesNo);
-  void stopTransaction();
+  int stopTransaction();
 
   //SearchBar slots
   void onSearchBarTextChanged(QString strToSearch);
@@ -92,16 +87,27 @@ private slots:
 protected:
   virtual void closeEvent(QCloseEvent * event);
   virtual void keyPressEvent(QKeyEvent * ke);
+  virtual bool eventFilter(QObject *, QEvent *);
 
 public:
-  explicit OutputDialog(QWidget *parent = 0);
+  explicit OutputDialog(QWidget *parent = nullptr);
   void setDebugMode(bool newValue);
   void setListOfAURPackagesToUpgrade(const QString& list);
-  void setPacmanSystemUpgrade(bool value);
+  void setViewAsTextBrowser(bool value);
+  void doSystemUpgrade();
+  void detachSharedMemory();
 
 public slots:
   void show();
   void reject();
+
+  void initAsTermWidget();
+  void doSystemUpgradeInTerminal();
+  void doAURUpgrade();
+  void onExecCommandInTabTerminal(QString command);
+  void onPressAnyKeyToContinue();
+  void onCancelControlKey();
+
 };
 
 #endif // OUTPUTDIALOG_H

notifier/pacmanhelper/README

@@ -1,11 +0,0 @@
-Command used to generate the PacmanHelperAdaptor:
-
-qdbusxml2cpp -c PacmanHelperAdaptor 
-	-a pacmanhelperadaptor.h:pacmanhelperadaptor.cpp 
-	polkit/org.octopi.pacmanhelper.xml
-
-Command used to generate the PacmanHelperClient:
-
-qdbusxml2cpp -v -c PacmanHelperClient 
-	-p pacmanhelperclient.h:pacmanhelperclient.cpp 
-	polkit/org.octopi.pacmanhelper.xml

notifier/pacmanhelper/main.cpp

@@ -1,11 +0,0 @@
-#include "pacmanhelper.h"
-#include <QCoreApplication>
-
-int main(int argc, char *argv[])
-{
-  QCoreApplication a(argc, argv);
-  
-  PacmanHelper pacmanHelper;
-
-  return a.exec();
-}

notifier/pacmanhelper/pacmanhelper.cpp

@@ -1,52 +0,0 @@
-#include "pacmanhelper.h"
-#include "pacmanhelperadaptor.h"
-#include <QCoreApplication>
-#include <QDBusConnection>
-#include <QProcess>
-#include <QDebug>
-
-#include <QFile>
-
-PacmanHelper::PacmanHelper(QObject *parent) :
-  QObject(parent)
-{
-  (void) new PacmanHelperAdaptor(this);
-
-  if (!QDBusConnection::systemBus().registerService("org.octopi.pacmanhelper")) {
-      qDebug() << "Another helper is already running!";
-      QCoreApplication::instance()->quit();
-  }
-
-  if (!QDBusConnection::systemBus().registerObject("/", this)) {
-      qDebug() << "Unable to register service interface to dbus!";
-      QCoreApplication::instance()->quit();
-  }
-}
-
-void PacmanHelper::syncdb()
-{
-  QProcess pacman;
-  QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-  env.insert("LANG", "us_EN");
-  pacman.setProcessEnvironment(env);
-
-  QStringList params;
-  params << "-Sy"; //-Syy or -Sy - eternal doubt!
-  QString command = "/usr/bin/pacman";
-  /*int code = */pacman.execute(command, params);
-
-  /*QString out;
-  out += "Return code of pacman command: " + QString::number(code) + "\n";
-  out += "Return of pacman command (stdout): " + pacman.readAllStandardOutput() + "\n";
-  out += "Return of pacman command (stderr): " + pacman.readAllStandardError() + "\n\n";
-
-  QString filename = QDir::homePath() + QDir::separator() + "output_pacmanhelper.txt";
-  QFile file( filename );
-  if ( file.open(QIODevice::ReadWrite) )
-  {
-    QTextStream stream( &file );
-    stream << out << endl;
-  }*/
-
-  emit syncdbcompleted();
-}