changed star shortcuts and updated most of the translations

updated magyar shortcuts

added ignoring Ctrl categoryButtonToggled if is mouse click for more consistent shortcut functions

fixed missing windows shortcut
This commit is contained in:
Eemil Praks
2022-01-04 15:31:20 +02:00
parent 690fab3d08
commit 7534989d9e
18 changed files with 225 additions and 225 deletions

View File

@@ -1241,7 +1241,7 @@ bool FileBrowser::keyPressed (GdkEventKey* event)
}
#ifdef __WIN32__
else if (shift && !ctrl && !alt && !altgr) { // rank
else if (!shift && !ctrl && !alt && !altgr) { // rank
switch(event->hardware_keycode) {
case 0x30: // 0-key
requestRanking (0);
@@ -1296,7 +1296,7 @@ bool FileBrowser::keyPressed (GdkEventKey* event)
}
#else
else if (shift && !ctrl && !alt) { // rank
else if (!shift && !ctrl && !alt) { // rank
switch(event->hardware_keycode) {
case 0x13:
requestRanking (0);

View File

@@ -1334,11 +1334,11 @@ bool FileCatalog::isInTabMode() const
void FileCatalog::categoryButtonToggled (Gtk::ToggleButton* b, bool isMouseClick)
{
//was control key pressed
bool control_down = modifierKey & GDK_CONTROL_MASK;
//was control key pressed (ignored if was not mouse click)
bool control_down = modifierKey & GDK_CONTROL_MASK && isMouseClick;
//was shift key pressed
bool shift_down = modifierKey & GDK_SHIFT_MASK;
//was shift key pressed (ignored if was not mouse click)
bool shift_down = modifierKey & GDK_SHIFT_MASK && isMouseClick;
// The event is process here, we can clear modifierKey now, it'll be set again on the next even
modifierKey = 0;
@@ -2244,7 +2244,7 @@ bool FileCatalog::handleShortcutKey (GdkEventKey* event)
#ifdef __WIN32__
if (!alt && !shift && !altgr) { // shift is reserved for ranking
if (!alt && shift && !altgr) {
switch(event->hardware_keycode) {
case 0x30:
categoryButtonToggled(bUnRanked, false);
@@ -2332,7 +2332,7 @@ bool FileCatalog::handleShortcutKey (GdkEventKey* event)
#else
if (!alt && !shift && !altgr) { // shift is reserved for ranking
if (!alt && shift && !altgr) {
switch(event->hardware_keycode) {
case 0x13:
categoryButtonToggled(bUnRanked, false);