-
Notifications
You must be signed in to change notification settings - Fork 78
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
GTK4: Convert Geeqie to a GtkApplication
GTK4 migration The following options are deleted: --fullscreen-start, --fullscreen-stop: Use --fullscreen which is a toggle --slideshow-start, --slideshow-stop: Use --slideshow which is a toggle --tools-show, --tools-hide: Use --tools which is a toggle --remote: No longer needed --disable-clutter: Start with GQ_DISABLE_CLUTTER=y[es] geeqie --cache-maintenance: Start with GQ_CACHE_MAINTENANCE=y[es] geeqie (disabled in this version) --new-instance: Start with GQ_NEW_INSTANCE=y[es] geeqie --blank, --list-add, --list-clear: I do not see the need for them GQ_CACHE_MAINTENANCE=y geeqie is disabled. It will be fixed in a future commit.
- Loading branch information
Showing
29 changed files
with
2,497 additions
and
3,153 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| # bash completion for geeqie-cache-maintenance -*- shell-script -*- | ||
|
|
||
| file_types='@(3fr|ani|arw|avif|bmp|cr2|cr3|crw|cur|dds|djvu|dng|erf|gif|gqv|heic|heif|ico|jp2|jpe|jpeg|jpg|jps|jxl|kdc|mef|mos|mpo|mrw|nef|orf|pbm|pdf|pef|pgm|png|pnm|ppm|psd|qif|qtif|raf|raw|rw2|scr|sr2|srf|svg|svgz|tga|tif|tiff|webp|xbm|xpm)' | ||
|
|
||
| actions='About AddMark0 AddMark1 AddMark2 AddMark3 AddMark4 AddMark5 AddMark6 AddMark7 AddMark8 AddMark9 AlterNone Animate Back ClearMarks CloseWindow ColorProfile0 ColorProfile1 ColorProfile2 ColorProfile3 ColorProfile4 ColorProfile5 ConnectZoom100 ConnectZoom200 ConnectZoom25 ConnectZoom300 ConnectZoom33 ConnectZoom400 ConnectZoom50 ConnectZoomFillHor ConnectZoomFillVert ConnectZoomFit ConnectZoomIn ConnectZoomOut Copy CopyImage CopyPath CopyPathUnquoted CropFourThree CropNone CropOneOne CropRectangle CropSixteenNine CropThreeTwo CutPath Delete DeleteWindow DrawRectangle Escape ExifRotate ExifWin FilterMark0 FilterMark1 FilterMark2 FilterMark3 FilterMark4 FilterMark5 FilterMark6 FilterMark7 FilterMark8 FilterMark9 FindDupes FirstImage FirstPage Flip FloatTools FolderTree Forward FullScreen Grayscale HelpChangeLog HelpContents HelpKbd HelpNotes HelpSearch HelpShortcuts HideBars HideSelectableToolbars HideTools HistogramChanB HistogramChanCycle HistogramChanG HistogramChanR HistogramChanRGB HistogramChanV HistogramModeCycle HistogramModeLin HistogramModeLog Home IgnoreAlpha ImageBack ImageForward ImageHistogram ImageOverlay ImageOverlayCycle IntMark0 IntMark1 IntMark2 IntMark3 IntMark4 IntMark5 IntMark6 IntMark7 IntMark8 IntMark9 KeywordAutocomplete LastImage LastPage LayoutConfig LogWindow Maintenance Mark0 Mark1 Mark2 Mark3 Mark4 Mark5 Mark6 Mark7 Mark8 Mark9 Mirror Move NewCollection NewFolder NewWindow NewWindowDefault NewWindowFromCurrent NextImage NextPage OpenArchive OpenCollection OpenRecent OpenWith OverUnderExposed PanView PermanentDelete Plugins Preferences PrevImage PrevPage Print Quit Rating0 Rating1 Rating2 Rating3 Rating4 Rating5 RatingM1 RectangularSelection Refresh Rename RenameWindow ResetMark0 ResetMark1 ResetMark2 ResetMark3 ResetMark4 ResetMark5 ResetMark6 ResetMark7 ResetMark8 ResetMark9 Rotate180 RotateCCW RotateCW SBar SBarSort SaveMetadata Search SearchAndRunCommand SelectAll SelectInvert SelectMark0 SelectMark1 SelectMark2 SelectMark3 SelectMark4 SelectMark5 SelectMark6 SelectMark7 SelectMark8 SelectMark9 SelectNone SetMark0 SetMark1 SetMark2 SetMark3 SetMark4 SetMark5 SetMark6 SetMark7 SetMark8 SetMark9 ShowFileFilter ShowInfoPixel ShowMarks SlideShow SlideShowFaster SlideShowPause SlideShowSlower SplitDownPane SplitHorizontal SplitNextPane SplitPaneSync SplitPreviousPane SplitQuad SplitSingle SplitTriple SplitUpPane SplitVertical StereoAuto StereoCross StereoCycle StereoOff StereoSBS Thumbnails ToggleMark0 ToggleMark1 ToggleMark2 ToggleMark3 ToggleMark4 ToggleMark5 ToggleMark6 ToggleMark7 ToggleMark8 ToggleMark9 UnselMark0 UnselMark1 UnselMark2 UnselMark3 UnselMark4 UnselMark5 UnselMark6 UnselMark7 UnselMark8 UnselMark9 Up UseColorProfiles UseImageProfile ViewIcons ViewInNewWindow ViewList WriteRotation WriteRotationKeepDate Zoom100 Zoom200 Zoom25 Zoom300 Zoom33 Zoom400 Zoom50 ZoomFillHor ZoomFillVert ZoomFit ZoomIn ZoomOut ZoomToRectangle' | ||
|
|
||
| options_basic='--blank --fullscreen --geometry= --help --help-all --help-gapplication --help-gtk --list --new-instance --log-file= --remote --slideshow --with-tools --without-tools --version --show-log-window --debug= --grep= --action= --action-list --back --close-window --config-load= --cache-metadata --cache-render= --cache-render-recurse= --cache-render-shared= --cache-render-shared-recurse= --cache-shared= --cache-thumbs= --delay= --first --fullscreen --file= --File= --fullscreen-start --fullscreen-stop --geometry= --get-collection= --get-collection-list --get-destination= --get-file-info --get-filelist= --get-filelist-recurse= --get-rectangle --get-render-intent --get-selection --get-sidecars= --get-window-list --id= --last --list-add= --list-clear --lua= --new-window --next --pixel-info --print0 --quit --raise --selection-add= --selection-clear --selection-remove= --slideshow --slideshow-recurse= --tell --tools --view=' | ||
|
|
||
| options_remote='--action= --action-list --back --cache-metadata --cache-render= --cache-render-recurse= --cache-render-shared= --cache-render-shared-recurse= --cache-shared= --cache-thumbs= --close-window --config-load= --debug= --delay= --file= --File= --first --fullscreen --geometry= --get-collection= --get-collection-list --get-destination= --get-file-info --get-filelist= --get-filelist-recurse= --get-rectangle --get-render-intent --get-selection --get-sidecars= --get-window-list --grep --id= --last --log-file= --lua= --new-window --next --pixel-info --print0 --quit --raise --selection-add= --selection-clear --selection-remove= --show-log-window --slideshow --slideshow-recurse= --tell --tools --view= --version' | ||
|
|
||
| _geeqie-cache-maintenance() | ||
| { | ||
| local cur prev | ||
| _init_completion -s || return | ||
|
|
||
| case "$prev" in | ||
| --action) | ||
| COMPREPLY=($(compgen -W '$actions' -- "$cur")) | ||
| return | ||
| ;; | ||
|
|
||
| --cache-maintenance | --cache-render | --cache-render-recurse | --cache-render-shared-recurse | --get-filelist | --get-filelist-recurse | --slideshow-recurse) | ||
| _filedir | ||
| return | ||
| ;; | ||
|
|
||
| --cache-shared | --cache-thumbs) | ||
| COMPREPLY=($(compgen -W 'clean clear' -- "$cur")) | ||
| return | ||
| ;; | ||
|
|
||
| --config-load) | ||
| _filedir xml | ||
| return | ||
| ;; | ||
|
|
||
| --file | --File | --get-destination | --get-sidecars | --list-add | --selection-add | --selection-remove | --view) | ||
| _filedir $file_types | ||
| return | ||
| ;; | ||
|
|
||
| --get-collection) | ||
| collection="$(find $HOME/.local/share/geeqie/collections/ -maxdepth 1 -name "*gqv" -exec basename {} \;)" | ||
| COMPREPLY=($(compgen -W '$collection' -- "$cur")) | ||
| return | ||
| ;; | ||
|
|
||
| --lua) | ||
| _filedir lua | ||
| return | ||
| ;; | ||
| esac | ||
|
|
||
| if [[ $cur == -* ]] | ||
| then | ||
| if [[ $COMP_LINE == *"MAINTAIN"* ]] | ||
| then | ||
| COMPREPLY=($(compgen -W '$options_maintenance' -- "$cur")) | ||
| else | ||
| COMPREPLY=($(compgen -W '$options_basic' -- "$cur")) | ||
| fi | ||
|
|
||
| [[ ${COMPREPLY-} == *[=] ]] && compopt -o nospace | ||
| return | ||
| fi | ||
|
|
||
| _filedir $file_types | ||
|
|
||
| } && complete -F _geeqie-cache-maintenance geeqie-cache-maintenance | ||
|
|
||
| # ex: filetype=sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| [Desktop Entry] | ||
| Name=Geeqie Cache Maintenance | ||
| GenericName=Image Viewer | ||
| Comment=View and manage images | ||
| Exec=/bin/true | ||
| Icon=geeqie | ||
| Type=Application | ||
| Terminal=false | ||
| StartupNotify=true | ||
| StartupWMClass=geeqie | ||
| NotShowIn=X-Geeqie; | ||
| Categories=Graphics;Viewer; | ||
| MimeType=application/x-navi-animation;image/bmp;image/x-bmp;image/x-MS-bmp;image/gif;image/x-icon;image/jpeg;image/png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-tga;image/tiff;image/x-xbitmap;image/x-xpixmap;image/svg;image/svg+xml;image/x-png;image/xpm;image/x-ico; | ||
| Keywords=Picture;Slideshow;Graphics; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| #!/bin/sh | ||
| #********************************************************************** | ||
| # Copyright (C) 2024 - The Geeqie Team | ||
| # | ||
| # Author: Colin Clark | ||
| # | ||
| # 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., | ||
| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| #********************************************************************** | ||
|
|
||
| set -e | ||
|
|
||
| # This will automatically pass the command name and args in the expected order. | ||
| # And `set -e` (above) means that we'll automatically exit with the same return | ||
| # code as our sub-command. | ||
| # Start with a clean environment containing only these variables. | ||
| # | ||
| # G_DEBUG="fatal-warnings" will force an abort if a warning or | ||
| # critical error is encountered. | ||
| # https://docs.gtk.org/glib/running.html#environment-variables | ||
|
|
||
| # Inhibit shellcheck warning SC2154 - var is referenced but not assigned | ||
| echo "${DBUS_SESSION_BUS_ADDRESS:-}" | ||
| echo "${XDG_CONFIG_HOME:-}" | ||
| echo "${XDG_RUNTIME_DIR:-}" | ||
|
|
||
| env -i DBUS_SESSION_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" HOME="$HOME" XDG_CONFIG_HOME="$XDG_CONFIG_HOME" XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR" G_DEBUG="fatal-warnings" "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.