Skip to content

Commit

Permalink
tests/other/app: changed the shortcut to "ctrl+alt+s" (ie. "cmd+alt+s…
Browse files Browse the repository at this point in the history
…" on mac)

--HG--
branch : 0.6
extra : transplant_source : %7Bs%0E%E0%F2tSWr%D0%93%3E%95t%24%F3%0F%2C%8F%EB
  • Loading branch information
jaripenu committed May 10, 2010
1 parent 788b22c commit d7c7ec3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
7 changes: 5 additions & 2 deletions tests/other/app/mainwindow.cpp
Expand Up @@ -35,8 +35,11 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)

QxtGlobalShortcut* shortcut = new QxtGlobalShortcut(this);
connect(shortcut, SIGNAL(activated()), this, SLOT(toggleVisibility()));
if (!shortcut->setShortcut(QKeySequence("Ctrl+Shift+Alt+S")))
ui.labelVisibility->hide();
QKeySequence key("Ctrl+Alt+S");
if (shortcut->setShortcut(key))
ui.labelVisibility->setText(ui.labelVisibility->text().arg(key.toString(QKeySequence::NativeText)));
else
ui.labelVisibility->hide();

#ifndef Q_WS_MAC
QTimer* timer = new QTimer(this);
Expand Down
2 changes: 1 addition & 1 deletion tests/other/app/mainwindow.ui
Expand Up @@ -71,7 +71,7 @@
<item>
<widget class="QxtLabel" name="labelVisibility" >
<property name="text" >
<string>The visibility of the application may be toggled with Ctrl+Alt+Shift+S.</string>
<string>The visibility of the application may be toggled with %1.</string>
</property>
<property name="elideMode" >
<enum>Qt::ElideRight</enum>
Expand Down

0 comments on commit d7c7ec3

Please sign in to comment.