mirror of
https://github.com/fergalmoran/flameshot.git
synced 2026-03-25 01:20:11 +00:00
* Add error handling functions to ConfigHandler Refurbished functions setValue and value which were previously unused. These functions now set/get a setting with error handling. Currently recognizes only errors recognizable by QSettings. * Make use of value and setValue in ConfigHandler Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add checker for unrecognized general options Extraneous config options in [General] will be reported as errors. Added some placeholder functions to be implemented in future commits. * Introduce keysFromGroup function Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Check shortcut names for duplicates Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix notification spam Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Implement shortcut conflict checking Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix reading of fallbacks on error If there is a config error, some values would not be loaded correctly. Using the newly implemented function ConfigHandler::contains instead of QSettings::contains solves this issue. These changes reveal u bug that causes a crash on startup. Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix crashes introduced in previous commit Because ConfigHandler is a dependency of most other classes, calling functions from those classes inside ConfigHandler caused infinite recursions in some cases. Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add config file watcher Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add missing config options Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix bug in shortcut conflict detection Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add error resolved notification Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add GUI error message overlay Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add indicator in config window Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Use ConfigHandler::fileChanged in ConfigWindow Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix watcher sometimes not firing Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Improve config file watching performance Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add new way to handle config This is only a fundamental implementation. Future commits will replace everything with this new paradigm. Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix getButtons and related functions Also refactored related code to use QList instead of QVector because QSettings does not work well with QVector. Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Make good use of the new way * Implement proper checking for basic types Everything is covered, apart from KeySequence. * Move fallback path to ExistingDir value handler Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Use consistent naming scheme in ConfigHandler Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Implement config getters/setters via macro Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Surround text with tr and clang-format Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix colors being saved obfuscated Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add ValueHandler::represenation Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Move ValueHandler to separate files Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * confighandler.cpp: rename macro CUSTOM to OPTION Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix bug with shortcut conflict checker Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Update docs and fix setAllTheButtons Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Handle filenamePattern properly Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix failing build due to wrong function name Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix QSet error due to Qt version mismatch Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Replace QSharedPointer::get with data for older Qt versions Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix failing build on MacOS and ubuntu 18.04 Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add column headers to recognizedGeneralOptions map Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix ubuntu 18.04 error Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix false positive when shortcuts empty Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix wrong shortcut group prefix Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Implement proper shortcut checking Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add shortcut map in ConfigHandler Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Move ConfigShortcuts functions to ShortcutsWidget Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix minor bugs Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add fallback scheme: Pictures, HOME, TMP Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add config --check CLI option Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Add config error log to GUI Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Rename ValueHandler::description to expected * Convert Qt's #AARRGGBB to #RRGGBBAA and vice versa Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Remove obsolete `saveAfterCopyPath` Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Fix errors in example config Also added an additional ; in front of actual comments to differentiate them from commented options. Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Allow special value 'picker' in userColors Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com> * Allow only name, #RRGGBB, and #RRGGBBAA color formats Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
102 lines
2.6 KiB
INI
102 lines
2.6 KiB
INI
;[General]
|
|
;; Configure which buttons to show after drawing a selection
|
|
;; Not easy to set by hand
|
|
;buttons=@Variant(\0\0\0\x7f\0\0\0\vQList<int>\0\0\0\0\x14\0\0\0\0\0\0\0\x1\0\0\0\x2\0\0\0\x3\0\0\0\x4\0\0\0\x5\0\0\0\x6\0\0\0\x12\0\0\0\xf\0\0\0\x13\0\0\0\a\0\0\0\b\0\0\0\t\0\0\0\x10\0\0\0\n\0\0\0\v\0\0\0\f\0\0\0\r\0\0\0\xe\0\0\0\x11)
|
|
;
|
|
;; List of colors for color picker
|
|
;; The colors are arranged counter-clockwise with the first being set to the right of the cursor
|
|
;; Colors are any valid hex code or W3C color name
|
|
;; "picker" adds a custom color picker
|
|
;userColors=#800000, #ff0000, #ffff00, #00ff00, #008000, #00ffff, #0000ff, #ff00ff, #800080, picker
|
|
;
|
|
;; Image Save Path
|
|
;savePath=/tmp
|
|
;
|
|
;; Whether the savePath is a fixed path (bool)
|
|
;savePathFixed=false
|
|
;
|
|
;; Main UI color
|
|
;; Color is any valid hex code or W3C color name
|
|
;uiColor=#740096
|
|
;
|
|
;; Contrast UI color
|
|
;; Color is any valid hex code or W3C color name
|
|
;contrastUiColor=#270032
|
|
;
|
|
;; Last used color
|
|
;; Color is any valid hex code or W3C color name
|
|
;drawColor=#ff0000
|
|
;
|
|
;; Show the help screen on startup (bool)
|
|
;showHelp=true
|
|
;
|
|
;; Show the side panel button (bool)
|
|
;showSidePanelButton=true
|
|
;
|
|
;; Ignore updates to versions less than this value
|
|
;ignoreUpdateToVersion=
|
|
;
|
|
;; Show desktop notifications (bool)
|
|
;showDesktopNotification=true
|
|
;
|
|
;; Filename pattern using C++ strftime formatting
|
|
;filenamePattern=%F_%H-%M
|
|
;
|
|
;; Whether the tray icon is disabled (bool)
|
|
;disabledTrayIcon=false
|
|
;
|
|
;; Last used tool thickness (int)
|
|
;drawThickness=1
|
|
;
|
|
;; Keep the App Launcher open after selecting an app (bool)
|
|
;keepOpenAppLauncher=false
|
|
;
|
|
;; Launch at startup (bool)
|
|
;startupLaunch=true
|
|
;
|
|
;; Opacity of area outside selection (int in range 0-255)
|
|
;contrastOpacity=190
|
|
;
|
|
;; Save image after copy (bool)
|
|
;saveAfterCopy=false
|
|
;
|
|
;; Copy path to image after save (bool)
|
|
;copyPathAfterSave=false
|
|
;
|
|
;; Use JPG format instead of PNG (bool)
|
|
;useJpgForClipboard=false
|
|
;
|
|
;; Shortcut Settings for all tools
|
|
;[Shortcuts]
|
|
;TYPE_ARROW=A
|
|
;TYPE_CIRCLE=C
|
|
;TYPE_CIRCLECOUNT=
|
|
;TYPE_COMMIT_CURRENT_TOOL=Ctrl+Return
|
|
;TYPE_COPY=Ctrl+C
|
|
;TYPE_DRAWER=D
|
|
;TYPE_EXIT=Ctrl+Q
|
|
;TYPE_IMAGEUPLOADER=Return
|
|
;TYPE_MARKER=M
|
|
;TYPE_MOVESELECTION=Ctrl+M
|
|
;TYPE_MOVE_DOWN=Down
|
|
;TYPE_MOVE_LEFT=Left
|
|
;TYPE_MOVE_RIGHT=Right
|
|
;TYPE_MOVE_UP=Up
|
|
;TYPE_OPEN_APP=Ctrl+O
|
|
;TYPE_PENCIL=P
|
|
;TYPE_PIN=
|
|
;TYPE_PIXELATE=B
|
|
;TYPE_RECTANGLE=R
|
|
;TYPE_REDO=Ctrl+Shift+Z
|
|
;TYPE_RESIZE_DOWN=Shift+Down
|
|
;TYPE_RESIZE_LEFT=Shift+Left
|
|
;TYPE_RESIZE_RIGHT=Shift+Right
|
|
;TYPE_RESIZE_UP=Shift+Up
|
|
;TYPE_SAVE=Ctrl+S
|
|
;TYPE_SELECTION=S
|
|
;TYPE_SELECTIONINDICATOR=
|
|
;TYPE_SELECT_ALL=Ctrl+A
|
|
;TYPE_TEXT=T
|
|
;TYPE_TOGGLE_PANEL=Space
|
|
;TYPE_UNDO=Ctrl+Z
|