From d78836fb2e8e7f1dd3855eeb14250a10900af4f4 Mon Sep 17 00:00:00 2001 From: lupoDharkael Date: Thu, 8 Jun 2017 16:07:48 +0200 Subject: [PATCH] Improve the Gnome's UX --- README.md | 2 + src/config/configwindow.cpp | 5 -- src/config/geneneralconf.cpp | 2 +- src/config/uicoloreditor.cpp | 12 ++--- src/infowindow.cpp | 3 +- translation/Internationalization_es.ts | 66 ++++++++++++-------------- 6 files changed, 38 insertions(+), 52 deletions(-) diff --git a/README.md b/README.md index 78c1b323..8aecd647 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,8 @@ Check the user manual [here](./docs/user-manual/userManual.md) **Not working on Wayland** +If you are using Gnome you need to install the [TopIcons](https://extensions.gnome.org/extension/495/topicons/) extension in order to see the systemtry icon. + In order to launch a new capture you need to execute `flameshot-cli`, the sources of the cli tool are in `./tools/flameshot-cli` (the tool is compiled independently). Check the ./docs folder for more information. diff --git a/src/config/configwindow.cpp b/src/config/configwindow.cpp index a7c9ce4c..37f87c74 100644 --- a/src/config/configwindow.cpp +++ b/src/config/configwindow.cpp @@ -32,7 +32,6 @@ ConfigWindow::ConfigWindow(QWidget *parent) : QWidget(parent) { setAttribute(Qt::WA_DeleteOnClose); setFixedSize(400, 450); - setWindowFlags(Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint); setWindowIcon(QIcon(":img/flameshot.png")); setWindowTitle(tr("Configuration")); @@ -56,10 +55,6 @@ ConfigWindow::ConfigWindow(QWidget *parent) : QWidget(parent) { ButtonListView *m_buttonListView = new ButtonListView(this); m_buttonListView->setFlow(QListWidget::TopToBottom); - m_buttonListView->setWhatsThis(tr("Select which buttons will appear arround " - "the capture's selection by clicking on its" - " checkbox.")); - m_layout->addWidget(m_buttonListView); show(); diff --git a/src/config/geneneralconf.cpp b/src/config/geneneralconf.cpp index 839a8bd0..1459b0a6 100644 --- a/src/config/geneneralconf.cpp +++ b/src/config/geneneralconf.cpp @@ -20,7 +20,7 @@ void GeneneralConf::initHelpShow() { QSettings settings; bool checked = settings.value("showHelp").toBool(); c->setChecked(checked); - c->setWhatsThis(tr("Show the help message at the beginning " + c->setToolTip(tr("Show the help message at the beginning " "in the capture mode.")); m_layout->addWidget(c); diff --git a/src/config/uicoloreditor.cpp b/src/config/uicoloreditor.cpp index 88d15e3f..300712d4 100644 --- a/src/config/uicoloreditor.cpp +++ b/src/config/uicoloreditor.cpp @@ -35,10 +35,6 @@ UIcolorEditor::UIcolorEditor(QWidget *parent) : QFrame(parent) { initColorWheel(); hLayout->addLayout(vLayout); setLayout(hLayout); - - setWhatsThis(tr("Color edition component, click on the color wheel and " - "change the UI colors!")); - } // updateUIcolor updates the appearance of the buttons void UIcolorEditor::updateUIcolor() { @@ -70,7 +66,7 @@ void UIcolorEditor::initColorWheel() { colorWheel->setColor(m_uiColor); colorWheel->setFixedSize(100,100); - colorWheel->setWhatsThis(tr("Change the color moving the selectors and see" + colorWheel->setToolTip(tr("Change the color moving the selectors and see" " the changes in the preview buttons.")); hLayout->addWidget(colorWheel); @@ -94,8 +90,7 @@ void UIcolorEditor::initButtons() { h1->addWidget(new QLabel(tr("Main Color"), this)); vLayout->addLayout(h1); - m_buttonMainColor->setToolTip(tr("Main Color")); - m_buttonMainColor->setWhatsThis(tr("Click on this button to set the edition" + m_buttonMainColor->setToolTip(tr("Click on this button to set the edition" " mode of the main color.")); QFrame *frame2 = new QFrame(this); @@ -115,8 +110,7 @@ void UIcolorEditor::initButtons() { h2->addWidget(new QLabel(tr("Contrast Color"), this)); vLayout->addLayout(h2); - m_buttonContrast->setToolTip(tr("Contrast Color")); - m_buttonContrast->setWhatsThis(tr("Click on this button to set the edition" + m_buttonContrast->setToolTip(tr("Click on this button to set the edition" " mode of the contrast color.")); m_lastButtonPressed = m_buttonMainColor; diff --git a/src/infowindow.cpp b/src/infowindow.cpp index 2ba0296e..1a4becc9 100644 --- a/src/infowindow.cpp +++ b/src/infowindow.cpp @@ -28,7 +28,6 @@ InfoWindow::InfoWindow(QWidget *parent) : QWidget(parent) { setAttribute(Qt::WA_DeleteOnClose); setFixedSize(400, 275); - setWindowFlags(Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint); setWindowIcon(QIcon(":img/flameshot.png")); setWindowTitle(tr("About")); @@ -67,7 +66,7 @@ QVector InfoWindow::description = { void InfoWindow::initInfoTable() { QTableWidget *table = new QTableWidget(this); - table->setWhatsThis(tr("Available shorcuts in the screen capture mode.")); + table->setToolTip(tr("Available shorcuts in the screen capture mode.")); layout->addWidget(table); diff --git a/translation/Internationalization_es.ts b/translation/Internationalization_es.ts index 0937d6cb..23a05cda 100644 --- a/translation/Internationalization_es.ts +++ b/translation/Internationalization_es.ts @@ -209,7 +209,7 @@ CaptureWidget - + Select an area with the mouse, or press Esc to exit. Press Enter to capture the screen. Press Right Click to choose the tool color. @@ -218,7 +218,7 @@ Presiona Enter para capturar la pantalla. Presiona Click Derecho para elegir color de herramienta. - + Uploading image... Subiendo imagen... @@ -226,45 +226,44 @@ Presiona Click Derecho para elegir color de herramienta. ConfigWindow - + Configuration Configuración - + UI color editor Editor de color de interfaz - + General General - + Button selection Selección de botones - Select which buttons will appear arround the capture's selection by clicking on its checkbox. - Selecciona qué botones aparecerán alrededor de la selección de captura clicando en su casilla. + Selecciona qué botones aparecerán alrededor de la selección de captura clicando en su casilla. Controller - + &Configuration &Configuración - + &Information &Información - + &Quit &Salir @@ -285,72 +284,72 @@ Presiona Click Derecho para elegir color de herramienta. InfoWindow - + About Información - + <b>Shortcuts</b> <b>Atajos</b> - + <b>License</b> <b>Licencia</b> - + Right Click Click Derecho - + Move selection 1px Mueve la selección 1px - + Resize selection 1px Redimensiona la selección 1px - + Quit capture Salir de la captura - + Copy to clipboard Copiar al portapapeles - + Save selection as a file Guarda la selección como un archivo - + Undo the last modification Deshacer la última modificación - + Show color picker Muestra el selector de color - + Available shorcuts in the screen capture mode. Atajos disponibles en el modo de captura de pantalla. - + Key Tecla - + Description Descripción @@ -385,39 +384,36 @@ Presiona Click Derecho para elegir color de herramienta. Selecciona un Botón para cambiar el color - Color edition component, click on the color wheel and change the UI colors! - Componente de edición de color, ¡clica en él para cambiar el color de la interfaz! + Componente de edición de color, ¡clica en él para cambiar el color de la interfaz! - + Change the color moving the selectors and see the changes in the preview buttons. Cambia el color moviendo los selectores y observa los cambios en los botones de previsualización. - + Select a Button to modify it Selecciona un Botón para modificarlo - - + Main Color Color Principal - + Click on this button to set the edition mode of the main color. Clica en este botón para aplicar el modo edición para el color primario. - - + Contrast Color Color de Contraste - + Click on this button to set the edition mode of the contrast color. Clica en este botón para aplicar el modo edición para el color de contraste.