From e45358d0b4d31acb4b345d1f5037e3a9f4458642 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Sun, 24 May 2009 22:48:46 +0200 Subject: Renamed connection.{cpp,h} to connectiondialog.{cpp,h} Consistent with the class name and avoids confusing it with the connection.{cpp,h} in net/tmwserv. --- src/CMakeLists.txt | 4 +-- src/Makefile.am | 4 +-- src/gui/connection.cpp | 69 -------------------------------------------- src/gui/connection.h | 62 --------------------------------------- src/gui/connectiondialog.cpp | 69 ++++++++++++++++++++++++++++++++++++++++++++ src/gui/connectiondialog.h | 62 +++++++++++++++++++++++++++++++++++++++ src/main.cpp | 2 +- 7 files changed, 136 insertions(+), 136 deletions(-) delete mode 100644 src/gui/connection.cpp delete mode 100644 src/gui/connection.h create mode 100644 src/gui/connectiondialog.cpp create mode 100644 src/gui/connectiondialog.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 82e1bdc3..91fe8e06 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -466,8 +466,8 @@ SET(SRCS_TMW gui/buddywindow.h gui/changeemaildialog.cpp gui/changeemaildialog.h - gui/connection.cpp - gui/connection.h + gui/connectiondialog.cpp + gui/connectiondialog.h gui/guildlistbox.cpp gui/guildlistbox.h gui/guildwindow.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 7ed6da63..23de64bc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -370,8 +370,8 @@ tmw_SOURCES += \ gui/buddywindow.h \ gui/changeemaildialog.cpp \ gui/changeemaildialog.h \ - gui/connection.cpp \ - gui/connection.h \ + gui/connectiondialog.cpp \ + gui/connectiondialog.h \ gui/guildlistbox.cpp \ gui/guildlistbox.h \ gui/guildwindow.cpp \ diff --git a/src/gui/connection.cpp b/src/gui/connection.cpp deleted file mode 100644 index 4863edcd..00000000 --- a/src/gui/connection.cpp +++ /dev/null @@ -1,69 +0,0 @@ -/* - * The Mana World - * Copyright (C) 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "connection.h" - -#include "gui/widgets/button.h" -#include "gui/widgets/label.h" -#include "gui/widgets/progressbar.h" - -#include "main.h" -#include "log.h" - -#include "utils/gettext.h" - -ConnectionDialog::ConnectionDialog(State previousState): - Window("Info"), mProgress(0), mPreviousState(previousState) -{ - setContentSize(200, 100); - - Button *cancelButton = new Button(_("Cancel"), "cancelButton", this); - mProgressBar = new ProgressBar(0.0, 200 - 10, 20, gcn::Color(128, 128, 128)); - gcn::Label *label = new Label(_("Connecting...")); - - cancelButton->setPosition(5, 100 - 5 - cancelButton->getHeight()); - mProgressBar->setPosition(5, cancelButton->getY() - 25); - label->setPosition(5, mProgressBar->getY() - 25); - - add(label); - add(cancelButton); - add(mProgressBar); - - center(); - setVisible(true); -} - -void ConnectionDialog::action(const gcn::ActionEvent &) -{ - logger->log("Cancel pressed"); - state = mPreviousState; -} - -void ConnectionDialog::logic() -{ - mProgress += 0.005f; - - if (mProgress > 1.0f) - mProgress = 0.0f; - - mProgressBar->setProgress(mProgress); - Window::logic(); -} diff --git a/src/gui/connection.h b/src/gui/connection.h deleted file mode 100644 index d6059c3f..00000000 --- a/src/gui/connection.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * The Mana World - * Copyright (C) 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef CONNECTION_H -#define CONNECTION_H - -#include "gui/widgets/window.h" - -#include "main.h" - -#include - -class ProgressBar; - -/** - * The connection dialog. - * - * \ingroup Interface - */ -class ConnectionDialog : public Window, gcn::ActionListener -{ - public: - /** - * Constructor - * - * @see Window::Window - */ - ConnectionDialog(State previousState); - - /** - * Called when the user presses Cancel. Restores the global state to - * the previous one. - */ - void action(const gcn::ActionEvent &); - - void logic(); - - private: - ProgressBar *mProgressBar; - float mProgress; - State mPreviousState; -}; - -#endif diff --git a/src/gui/connectiondialog.cpp b/src/gui/connectiondialog.cpp new file mode 100644 index 00000000..1c3b7ff5 --- /dev/null +++ b/src/gui/connectiondialog.cpp @@ -0,0 +1,69 @@ +/* + * The Mana World + * Copyright (C) 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "connectiondialog.h" + +#include "gui/widgets/button.h" +#include "gui/widgets/label.h" +#include "gui/widgets/progressbar.h" + +#include "main.h" +#include "log.h" + +#include "utils/gettext.h" + +ConnectionDialog::ConnectionDialog(State previousState): + Window("Info"), mProgress(0), mPreviousState(previousState) +{ + setContentSize(200, 100); + + Button *cancelButton = new Button(_("Cancel"), "cancelButton", this); + mProgressBar = new ProgressBar(0.0, 200 - 10, 20, gcn::Color(128, 128, 128)); + gcn::Label *label = new Label(_("Connecting...")); + + cancelButton->setPosition(5, 100 - 5 - cancelButton->getHeight()); + mProgressBar->setPosition(5, cancelButton->getY() - 25); + label->setPosition(5, mProgressBar->getY() - 25); + + add(label); + add(cancelButton); + add(mProgressBar); + + center(); + setVisible(true); +} + +void ConnectionDialog::action(const gcn::ActionEvent &) +{ + logger->log("Cancel pressed"); + state = mPreviousState; +} + +void ConnectionDialog::logic() +{ + mProgress += 0.005f; + + if (mProgress > 1.0f) + mProgress = 0.0f; + + mProgressBar->setProgress(mProgress); + Window::logic(); +} diff --git a/src/gui/connectiondialog.h b/src/gui/connectiondialog.h new file mode 100644 index 00000000..d6059c3f --- /dev/null +++ b/src/gui/connectiondialog.h @@ -0,0 +1,62 @@ +/* + * The Mana World + * Copyright (C) 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef CONNECTION_H +#define CONNECTION_H + +#include "gui/widgets/window.h" + +#include "main.h" + +#include + +class ProgressBar; + +/** + * The connection dialog. + * + * \ingroup Interface + */ +class ConnectionDialog : public Window, gcn::ActionListener +{ + public: + /** + * Constructor + * + * @see Window::Window + */ + ConnectionDialog(State previousState); + + /** + * Called when the user presses Cancel. Restores the global state to + * the previous one. + */ + void action(const gcn::ActionEvent &); + + void logic(); + + private: + ProgressBar *mProgressBar; + float mProgress; + State mPreviousState; +}; + +#endif diff --git a/src/main.cpp b/src/main.cpp index 2bf9820e..32bf2e2f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -53,7 +53,7 @@ #include "gui/serverselectdialog.h" #include "gui/setup.h" #ifdef TMWSERV_SUPPORT -#include "gui/connection.h" +#include "gui/connectiondialog.h" #include "gui/quitdialog.h" #include "gui/serverdialog.h" #endif -- cgit v1.2.3-70-g09d2