WSL/SLF GitLab Repository

Commit 2b016709 authored by Michael Reisecker's avatar Michael Reisecker
Browse files

Finally rename "gui_elements" into "panels"

The name was a relict from the very first day of project structuring,
but this name here makes for much much nicer tab-completing to source
file names...
parent 38d07713
......@@ -82,24 +82,6 @@ SOURCES += \
src/gui/SettingsWindow.cc \
src/gui/TerminalView.cc \
src/gui/WorkflowPanel.cc \
src/gui_elements/Atomic.cc \
src/gui_elements/Checkbox.cc \
src/gui_elements/Checklist.cc \
src/gui_elements/Choice.cc \
src/gui_elements/Datepicker.cc \
src/gui_elements/Dropdown.cc \
src/gui_elements/FilePath.cc \
src/gui_elements/GridPanel.cc \
src/gui_elements/Group.cc \
src/gui_elements/gui_elements.cc \
src/gui_elements/Helptext.cc \
src/gui_elements/HorizontalPanel.cc \
src/gui_elements/Label.cc \
src/gui_elements/Number.cc \
src/gui_elements/Replicator.cc \
src/gui_elements/Selector.cc \
src/gui_elements/Spacer.cc \
src/gui_elements/Textfield.cc \
src/main/colors.cc \
src/main/common.cc \
src/main/dimensions.cc \
......@@ -111,6 +93,24 @@ SOURCES += \
src/main/os.cc \
src/main/settings.cc \
src/main/XMLReader.cc \
src/panels/Atomic.cc \
src/panels/Checkbox.cc \
src/panels/Checklist.cc \
src/panels/Choice.cc \
src/panels/Datepicker.cc \
src/panels/Dropdown.cc \
src/panels/FilePath.cc \
src/panels/GridPanel.cc \
src/panels/Group.cc \
src/panels/panels.cc \
src/panels/Helptext.cc \
src/panels/HorizontalPanel.cc \
src/panels/Label.cc \
src/panels/Number.cc \
src/panels/Replicator.cc \
src/panels/Selector.cc \
src/panels/Spacer.cc \
src/panels/Textfield.cc \
lib/tinyexpr.c
HEADERS += \
......@@ -130,24 +130,6 @@ HEADERS += \
src/gui/SettingsWindow.h \
src/gui/TerminalView.h \
src/gui/WorkflowPanel.h \
src/gui_elements/Atomic.h \
src/gui_elements/Checkbox.h \
src/gui_elements/Checklist.h \
src/gui_elements/Choice.h \
src/gui_elements/Datepicker.h \
src/gui_elements/Dropdown.h \
src/gui_elements/FilePath.h \
src/gui_elements/gui_elements.h \
src/gui_elements/GridPanel.h \
src/gui_elements/Group.h \
src/gui_elements/Helptext.h \
src/gui_elements/HorizontalPanel.h \
src/gui_elements/Label.h \
src/gui_elements/Number.h \
src/gui_elements/Replicator.h \
src/gui_elements/Selector.h \
src/gui_elements/Spacer.h \
src/gui_elements/Textfield.h \
src/main/XMLReader.h \
src/main/colors.h \
src/main/common.h \
......@@ -159,6 +141,24 @@ HEADERS += \
src/main/inishell.h \
src/main/os.h \
src/main/settings.h \
src/panels/Atomic.h \
src/panels/Checkbox.h \
src/panels/Checklist.h \
src/panels/Choice.h \
src/panels/Datepicker.h \
src/panels/Dropdown.h \
src/panels/FilePath.h \
src/panels/panels.h \
src/panels/GridPanel.h \
src/panels/Group.h \
src/panels/Helptext.h \
src/panels/HorizontalPanel.h \
src/panels/Label.h \
src/panels/Number.h \
src/panels/Replicator.h \
src/panels/Selector.h \
src/panels/Spacer.h \
src/panels/Textfield.h \
lib/tinyexpr.h
#automatic creation of .qm language files from .ts language dictionaries:
......
......@@ -41,14 +41,14 @@ Doppelklick um zu öffnen, Rechtsklick für weitere Optionen.</translation>
<context>
<name>Atomic</name>
<message>
<location filename="../../src/gui_elements/Atomic.cc" line="401"/>
<location filename="../../src/gui_elements/Atomic.cc" line="425"/>
<location filename="../../src/panels/Atomic.cc" line="401"/>
<location filename="../../src/panels/Atomic.cc" line="425"/>
<source>Reset to default</source>
<translation>Auf Standardwert zurücksetzen</translation>
</message>
<message>
<location filename="../../src/gui_elements/Atomic.cc" line="402"/>
<location filename="../../src/gui_elements/Atomic.cc" line="427"/>
<location filename="../../src/panels/Atomic.cc" line="402"/>
<location filename="../../src/panels/Atomic.cc" line="427"/>
<source>Delete key</source>
<translation>Schlüssel löschen</translation>
</message>
......@@ -56,7 +56,7 @@ Doppelklick um zu öffnen, Rechtsklick für weitere Optionen.</translation>
<context>
<name>Datepicker</name>
<message>
<location filename="../../src/gui_elements/Datepicker.cc" line="74"/>
<location filename="../../src/panels/Datepicker.cc" line="74"/>
<source>Pick a date/time</source>
<translation>Datum/Zeit wählen</translation>
</message>
......@@ -64,7 +64,7 @@ Doppelklick um zu öffnen, Rechtsklick für weitere Optionen.</translation>
<context>
<name>Dropdown</name>
<message>
<location filename="../../src/gui_elements/Dropdown.cc" line="120"/>
<location filename="../../src/panels/Dropdown.cc" line="120"/>
<source>&lt;edit&gt;</source>
<translation>&lt;bearbeiten&gt;</translation>
</message>
......@@ -72,83 +72,83 @@ Doppelklick um zu öffnen, Rechtsklick für weitere Optionen.</translation>
<context>
<name>FilePath</name>
<message>
<location filename="../../src/gui_elements/FilePath.cc" line="74"/>
<location filename="../../src/panels/FilePath.cc" line="74"/>
<source>&lt;no path set&gt;</source>
<translation>&lt;kein Pfad&gt;</translation>
</message>
<message>
<location filename="../../src/gui_elements/FilePath.cc" line="74"/>
<location filename="../../src/panels/FilePath.cc" line="74"/>
<source>&lt;no file set&gt;</source>
<translation>&lt;keine Datei&gt;</translation>
</message>
<message>
<location filename="../../src/gui_elements/FilePath.cc" line="86"/>
<location filename="../../src/panels/FilePath.cc" line="86"/>
<source>Open path</source>
<translation>Pfad öffnen</translation>
</message>
<message>
<location filename="../../src/gui_elements/FilePath.cc" line="89"/>
<location filename="../../src/panels/FilePath.cc" line="89"/>
<source>Open file</source>
<translation>Datei öffnen</translation>
</message>
<message>
<location filename="../../src/gui_elements/FilePath.cc" line="97"/>
<location filename="../../src/panels/FilePath.cc" line="97"/>
<source>All Files (*)</source>
<translation>Alle Dateien (*)</translation>
</message>
<message>
<location filename="../../src/gui_elements/FilePath.cc" line="139"/>
<location filename="../../src/panels/FilePath.cc" line="139"/>
<source>[Empty file name]</source>
<translation>[Leerer Dateiname]</translation>
</message>
<message>
<location filename="../../src/gui_elements/FilePath.cc" line="144"/>
<location filename="../../src/panels/FilePath.cc" line="144"/>
<source>[Folder does not exist]</source>
<translation>[Ordner existiert nicht]</translation>
</message>
<message>
<location filename="../../src/gui_elements/FilePath.cc" line="144"/>
<location filename="../../src/panels/FilePath.cc" line="144"/>
<source>[File does not exist]</source>
<translation>[Datei existiert nicht]</translation>
</message>
<message>
<location filename="../../src/gui_elements/FilePath.cc" line="146"/>
<location filename="../../src/panels/FilePath.cc" line="146"/>
<source>[Directory path points to a file]</source>
<translation>[Ordner-Pfad zeigt auf Datei]</translation>
</message>
<message>
<location filename="../../src/gui_elements/FilePath.cc" line="148"/>
<location filename="../../src/panels/FilePath.cc" line="148"/>
<source>[File path points to a directory]</source>
<translation>[Datei-Pfad zeigt auf Ordner]</translation>
</message>
<message>
<location filename="../../src/gui_elements/FilePath.cc" line="159"/>
<location filename="../../src/panels/FilePath.cc" line="159"/>
<source>[File is an executable]</source>
<translation>[Datei ist ein Programm]</translation>
</message>
<message>
<location filename="../../src/gui_elements/FilePath.cc" line="161"/>
<location filename="../../src/panels/FilePath.cc" line="161"/>
<source>[File is a symbolic link]</source>
<translation>[Datei ist eine Veknüpfung]</translation>
</message>
<message>
<location filename="../../src/gui_elements/FilePath.cc" line="163"/>
<location filename="../../src/panels/FilePath.cc" line="163"/>
<source>[File already exists]</source>
<translation>[Datei existiert bereits]</translation>
</message>
<message>
<location filename="../../src/gui_elements/FilePath.cc" line="165"/>
<location filename="../../src/panels/FilePath.cc" line="165"/>
<source>[File name has leading or trailing whitespaces]</source>
<translation>[Dateiname beinhaltet Leerzeichen am Anfang oder Ende]</translation>
</message>
<message>
<location filename="../../src/gui_elements/FilePath.cc" line="189"/>
<location filename="../../src/panels/FilePath.cc" line="189"/>
<source>Open Folder</source>
<translation>Ordner öffnen</translation>
</message>
<message>
<location filename="../../src/gui_elements/FilePath.cc" line="193"/>
<location filename="../../src/gui_elements/FilePath.cc" line="196"/>
<location filename="../../src/panels/FilePath.cc" line="193"/>
<location filename="../../src/panels/FilePath.cc" line="196"/>
<source>Open File</source>
<translation>Datei öffnen</translation>
</message>
......@@ -567,19 +567,19 @@ See details for a list or go back to the GUI and set all highlighted fields.</so
<context>
<name>Number</name>
<message>
<location filename="../../src/gui_elements/Number.cc" line="123"/>
<location filename="../../src/panels/Number.cc" line="123"/>
<source>Enter an expression such as ${other_ini_key}, ${env:my_env_var} or ${{arithm. expression}}</source>
<translation>Eingabe eines Ausdrucks wie z. B. ${anderer_ini_schluessel}, ${env:meine_umgebungsvariable} oder ${{arithm. Austruck}}</translation>
</message>
<message>
<location filename="../../src/gui_elements/Number.cc" line="432"/>
<location filename="../../src/gui_elements/Number.cc" line="451"/>
<location filename="../../src/panels/Number.cc" line="432"/>
<location filename="../../src/panels/Number.cc" line="451"/>
<source>Invalid numeric INI value</source>
<translation>Invalider numerischer INI-Wert</translation>
</message>
<message>
<location filename="../../src/gui_elements/Number.cc" line="438"/>
<location filename="../../src/gui_elements/Number.cc" line="457"/>
<location filename="../../src/panels/Number.cc" line="438"/>
<location filename="../../src/panels/Number.cc" line="457"/>
<source>Truncated numeric INI value</source>
<translation>Numerischer INI-Wert wurde begrenzt</translation>
</message>
......@@ -1011,7 +1011,7 @@ See details for a list or go back to the GUI and set all highlighted fields.</so
<translation>Konnte Einstellungsdatei nicht schreiben</translation>
</message>
<message>
<location filename="../../src/gui_elements/gui_elements.cc" line="77"/>
<location filename="../../src/panels/panels.cc" line="77"/>
<source>XML error: A parameter in the XML file is missing its type.</source>
<translation>XML Fehler: Ein XML-Parameter besitzt keinen Typen.</translation>
</message>
......@@ -1084,12 +1084,12 @@ Andernfalls funktioniert INIshell wie gewohnt, wird aber keine Einstellungen spe
<context>
<name>Selector</name>
<message>
<location filename="../../src/gui_elements/Selector.cc" line="178"/>
<location filename="../../src/panels/Selector.cc" line="178"/>
<source>Empty text field</source>
<translation>Leeres Textfeld</translation>
</message>
<message>
<location filename="../../src/gui_elements/Selector.cc" line="182"/>
<location filename="../../src/panels/Selector.cc" line="182"/>
<source>Item already exists</source>
<translation>Wert existiert bereits</translation>
</message>
......
......@@ -29,7 +29,7 @@
#include "src/gui/MainPanel.h"
#include "src/gui/SectionTab.h"
#include "src/gui_elements/Group.h"
#include "src/panels/Group.h"
class HelpWindow : public QMainWindow {
Q_OBJECT
......
......@@ -25,7 +25,7 @@
#include "src/main/os.h"
#include "src/main/settings.h"
#include "src/main/XMLReader.h"
#include "src/gui_elements/gui_elements.h"
#include "src/panels/panels.h"
#include <QGroupBox>
#include <QHBoxLayout>
......
......@@ -27,8 +27,8 @@
#define MAINPANEL_H
#include "SectionTab.h"
#include "src/gui_elements/gui_elements.h"
#include "src/gui/WorkflowPanel.h"
#include "src/panels/panels.h"
#include <QList>
#include <QStackedWidget>
......
......@@ -24,8 +24,6 @@
#include "MainWindow.h"
#include "RememberDialog.h"
#include "src/gui/AboutWindow.h"
#include "src/gui_elements/Atomic.h"
#include "src/gui_elements/Group.h" //to exclude Groups from panel search
#include "src/main/colors.h"
#include "src/main/common.h"
#include "src/main/constants.h"
......@@ -35,6 +33,8 @@
#include "src/main/inishell.h"
#include "src/main/settings.h"
#include "src/main/XMLReader.h"
#include "src/panels/Atomic.h"
#include "src/panels/Group.h" //to exclude Groups from panel search
#include <QApplication>
#include <QCheckBox>
......@@ -113,7 +113,7 @@ MainWindow::MainWindow(QString &settings_location, const QStringList &errors, QM
* | ^
* Find panels in XML <----- inishell.cc |_ WorkflowPanel::scanFoldersForApps()
* |
* Build panels <----- gui_elements.cc -----> The panels' constructors
* Build panels <----- panels.cc -----> The panels' constructors
* |
* Set panels' properties <----- the panels' setOptions() member functions
* |
......
......@@ -18,12 +18,12 @@
#include "PreviewWindow.h"
#include "RememberDialog.h"
#include "src/gui_elements/Atomic.h"
#include "src/main/colors.h"
#include "src/main/common.h"
#include "src/main/os.h"
#include "src/main/inishell.h"
#include "src/main/settings.h"
#include "src/panels/Atomic.h"
#include <QClipboard>
#include <QCoreApplication>
......
......@@ -19,12 +19,13 @@
#include "RememberDialog.h"
#include "SectionTab.h"
#include "SectionButton.h"
#include "src/gui_elements/Group.h"
#include "src/main/colors.h"
#include "src/main/inishell.h"
#include "src/main/os.h"
#include "src/main/settings.h"
#include "src/main/XMLReader.h"
#include "src/panels/Group.h"
/**
* @class ScrollPanel
......
......@@ -27,8 +27,8 @@
#ifndef SECTIONTAB_H
#define SECTIONTAB_H
#include "src/gui_elements/Group.h"
#include "src/main/INIParser.h"
#include "src/panels/Group.h"
#include <QList>
#include <QScrollArea>
......
......@@ -18,13 +18,14 @@
#include "WorkflowPanel.h"
#include "src/gui/PathView.h"
#include "src/gui_elements/Atomic.h" //for getQtKey()
#include "src/main/colors.h"
#include "src/main/common.h"
#include "src/main/constants.h"
#include "src/main/inishell.h"
#include "src/main/os.h"
#include "src/main/settings.h"
#include "src/panels/Atomic.h" //for getQtKey()
#include <QtGlobal>
#include <QComboBox>
......
......@@ -18,7 +18,7 @@
#include "expressions.h"
#include "inishell.h"
#include "src/gui_elements/Atomic.h"
#include "src/panels/Atomic.h"
#include "lib/tinyexpr.h"
......
......@@ -17,8 +17,8 @@
*/
#include "inishell.h"
#include "src/gui_elements/gui_elements.h"
#include "src/main/colors.h"
#include "src/panels/panels.h"
#ifdef DEBUG
#include <iostream>
......
......@@ -24,10 +24,11 @@
#ifndef ATOMIC_H
#define ATOMIC_H
#include "src/gui_elements/Helptext.h"
#include "src/main/common.h"
#include "src/main/constants.h"
#include "src/main/INIParser.h"
#include "src/panels/Helptext.h"
#include <QFont>
#include <QHBoxLayout>
......
......@@ -25,7 +25,7 @@
#define CHECKBOX_H
#include "Atomic.h"
#include "src/gui_elements/Group.h"
#include "src/panels/Group.h"
#include <QCheckBox>
#include <QString>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment