This commit is contained in:
@@ -452,8 +452,8 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent)
|
|||||||
connect ( pushButton_break, SIGNAL( clicked()), this, SLOT ( breakButtonClicked() ) ); // auch wieder starten!!!!
|
connect ( pushButton_break, SIGNAL( clicked()), this, SLOT ( breakButtonClicked() ) ); // auch wieder starten!!!!
|
||||||
|
|
||||||
//Nachrichten Thread-Save
|
//Nachrichten Thread-Save
|
||||||
connect(this, SIGNAL(SignalNetClientSuccess(int)), myConnectToServerDialog, SLOT(refresh(int)));
|
connect(this, SIGNAL(SignalNetClientSuccess(int)), this, SLOT(refreshConnectToServerDialog(int)));
|
||||||
connect(this, SIGNAL(SignalNetClientError(int, int)), myConnectToServerDialog, SLOT(error(int, int)));
|
connect(this, SIGNAL(SignalNetClientError(int, int)), this, SLOT(errorConnectToServerDialog(int, int)));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1914,3 +1914,6 @@ void mainWindowImpl::switchToolBox() {
|
|||||||
else { groupBox_tools->hide(); }
|
else { groupBox_tools->hide(); }
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void mainWindowImpl::refreshConnectToServerDialog(int actionID) { myConnectToServerDialog->refresh(actionID); }
|
||||||
|
void mainWindowImpl::errorConnectToServerDialog(int errorID, int osErrorID) { myConnectToServerDialog->error(errorID, osErrorID); }
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ class QColor;
|
|||||||
|
|
||||||
class mainWindowImpl: public QMainWindow, public Ui::mainWindow {
|
class mainWindowImpl: public QMainWindow, public Ui::mainWindow {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
mainWindowImpl(QMainWindow *parent = 0 );
|
mainWindowImpl(QMainWindow *parent = 0 );
|
||||||
|
|
||||||
@@ -85,6 +86,10 @@ public:
|
|||||||
|
|
||||||
void setSpeeds();
|
void setSpeeds();
|
||||||
|
|
||||||
|
signals:
|
||||||
|
void SignalNetClientSuccess(int actionID);
|
||||||
|
void SignalNetClientError(int errorID, int osErrorID);
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
|
|
||||||
void setGameSpeed(const int theValue) { guiGameSpeed = theValue; setSpeeds(); } // Achtung Faktor 10!!!
|
void setGameSpeed(const int theValue) { guiGameSpeed = theValue; setSpeeds(); } // Achtung Faktor 10!!!
|
||||||
@@ -168,12 +173,8 @@ public slots:
|
|||||||
|
|
||||||
void paintStartSplash();
|
void paintStartSplash();
|
||||||
|
|
||||||
signals:
|
void refreshConnectToServerDialog(int actionID);
|
||||||
|
void errorConnectToServerDialog(int errorID, int osErrorID);
|
||||||
void SignalNetClientSuccess(int actionID);
|
|
||||||
void SignalNetClientError(int errorID, int osErrorID);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
@@ -277,6 +278,8 @@ private:
|
|||||||
QColor active;
|
QColor active;
|
||||||
QColor inactive;
|
QColor inactive;
|
||||||
QColor highlight;
|
QColor highlight;
|
||||||
|
|
||||||
|
friend class GuiWrapper;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user