Compare commits

..

No commits in common. "715c8252d87b06700e202f729efce597231a61b8" and "cdc737a823284decafb03cd222f0db0375c79665" have entirely different histories.

5 changed files with 6 additions and 40 deletions

Binary file not shown.

Binary file not shown.

View file

@ -76,8 +76,6 @@ MainWindow::MainWindow()
&MainWindow::onExportSalesJsonActionTriggered); &MainWindow::onExportSalesJsonActionTriggered);
connect(ui_.importSalesJsonAction, &QAction::triggered, this, connect(ui_.importSalesJsonAction, &QAction::triggered, this,
&MainWindow::onImportSalesJsonActionTriggered); &MainWindow::onImportSalesJsonActionTriggered);
readGeometry();
} }
void MainWindow::onActionEditSellerTriggered() void MainWindow::onActionEditSellerTriggered()
@ -355,29 +353,3 @@ void MainWindow::onImportSalesJsonActionTriggered()
} }
setSaleModel(); setSaleModel();
} }
void MainWindow::writeGeometry()
{
QSettings settings;
settings.beginGroup("mainwindow");
settings.setValue("size", size());
settings.setValue("pos", pos());
settings.endGroup();
}
void MainWindow::readGeometry()
{
QSettings settings;
settings.beginGroup("mainwindow");
resize(settings.value("size", QSize(800, 600)).toSize());
move(settings.value("pos", QPoint(200, 200)).toPoint());
settings.endGroup();
}
void MainWindow::closeEvent(QCloseEvent* event)
{
writeGeometry();
event->accept();
}

View file

@ -6,7 +6,6 @@
#include <marketplace.h> #include <marketplace.h>
#include <QMainWindow> #include <QMainWindow>
#include <QtGui/QCloseEvent>
#include <memory> #include <memory>
@ -30,9 +29,6 @@ class MainWindow : public QMainWindow
void onAboutQt(); void onAboutQt();
void onAbout(); void onAbout();
protected:
virtual void closeEvent(QCloseEvent* event) override;
private: private:
void onActionEditSellerTriggered(); void onActionEditSellerTriggered();
void onSellerNoEditCheckSellerNo(); void onSellerNoEditCheckSellerNo();
@ -43,8 +39,6 @@ class MainWindow : public QMainWindow
void onExportSalesJsonActionTriggered(); void onExportSalesJsonActionTriggered();
void onImportSalesJsonActionTriggered(); void onImportSalesJsonActionTriggered();
void setSaleModel(); void setSaleModel();
void writeGeometry();
void readGeometry();
Ui::MainWindow ui_; Ui::MainWindow ui_;
std::unique_ptr<Marketplace> marketplace_; std::unique_ptr<Marketplace> marketplace_;

View file

@ -62,7 +62,7 @@
</font> </font>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Geben Sie hier die Verkäufernummer ein.</string> <string>Geben Sie hier die Verkäufernummer ein</string>
</property> </property>
<property name="statusTip"> <property name="statusTip">
<string>Geben Sie hier die Verkäufernummer ein</string> <string>Geben Sie hier die Verkäufernummer ein</string>
@ -471,27 +471,27 @@ drucken</string>
</action> </action>
<action name="exportSellerJsonAction"> <action name="exportSellerJsonAction">
<property name="text"> <property name="text">
<string>Exportieren für andere Kasse (JSON)</string> <string>Exportieren (JSON)</string>
</property> </property>
</action> </action>
<action name="importSellerExcelAction"> <action name="importSellerExcelAction">
<property name="text"> <property name="text">
<string>Aus Excel-Datei (initial)</string> <string>Aus Excel-Datei</string>
</property> </property>
</action> </action>
<action name="importSellerJsonAction"> <action name="importSellerJsonAction">
<property name="text"> <property name="text">
<string>Aus JSON-Datei (von anderer Kasse)</string> <string>Aus JSON-Datei</string>
</property> </property>
</action> </action>
<action name="exportSalesJsonAction"> <action name="exportSalesJsonAction">
<property name="text"> <property name="text">
<string>Exportieren für andere Kasse (JSON)</string> <string>Exportieren (JSON)</string>
</property> </property>
</action> </action>
<action name="importSalesJsonAction"> <action name="importSalesJsonAction">
<property name="text"> <property name="text">
<string>Importieren von anderer Kasse (JSON)</string> <string>Importieren (JSON)</string>
</property> </property>
</action> </action>
</widget> </widget>