summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-02-07 11:13:29 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2010-02-07 11:13:29 +0100
commit3b6c67de81b54d2a6503bd0e9c377b260e4356ac (patch)
tree5ca515b8a3f7767fc10a1dff92eb40d0541b3a1f /src
parent90a52bfc4eeecff7d5fc683aed45c0b51d6880ac (diff)
downloadmana-client-3b6c67de81b54d2a6503bd0e9c377b260e4356ac.tar.gz
mana-client-3b6c67de81b54d2a6503bd0e9c377b260e4356ac.tar.bz2
mana-client-3b6c67de81b54d2a6503bd0e9c377b260e4356ac.tar.xz
mana-client-3b6c67de81b54d2a6503bd0e9c377b260e4356ac.zip
Removed the no longer used progress bar and label
They got replaced by the ConnectionDialog.
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp27
1 files changed, 3 insertions, 24 deletions
diff --git a/src/main.cpp b/src/main.cpp
index b8eb8671..f96480f9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -58,8 +58,6 @@
#include "gui/widgets/button.h"
#include "gui/widgets/desktop.h"
-#include "gui/widgets/label.h"
-#include "gui/widgets/progressbar.h"
#include "net/charhandler.h"
#include "net/gamehandler.h"
@@ -769,13 +767,12 @@ int main(int argc, char *argv[])
// Needs to be created in main, as the updater uses it
guiPalette = new Palette;
- Window *currentDialog = NULL;
- QuitDialog* quitDialog = NULL;
+ Window *currentDialog = 0;
+ QuitDialog *quitDialog = 0;
setupWindow = new Setup;
gcn::Container *top = static_cast<gcn::Container*>(gui->getTop());
Desktop *desktop = 0;
- ProgressBar *progressBar = 0;
Button *setupButton = 0;
sound.playMusic(branding.getValue("loginMusic", "Magick - Real.ogg"));
@@ -831,18 +828,9 @@ int main(int argc, char *argv[])
}
if (Net::getGeneralHandler())
- {
Net::getGeneralHandler()->flushNetwork();
- }
- gui->logic();
-
- if (progressBar && progressBar->isVisible())
- {
- progressBar->setProgress(progressBar->getProgress() + 0.005f);
- if (progressBar->getProgress() == 1.0f)
- progressBar->setProgress(0.0f);
- }
+ gui->logic();
gui->draw();
graphics->updateScreen();
@@ -874,15 +862,6 @@ int main(int argc, char *argv[])
{
desktop = new Desktop;
top->add(desktop);
- progressBar = new ProgressBar(0.0f, 100, 20,
- gcn::Color(168, 116, 31));
- progressBar->setSmoothProgress(false);
- Label *progressLabel = new Label;
- top->add(progressBar, 5, top->getHeight() - 5 -
- progressBar->getHeight());
- top->add(progressLabel, 15 + progressBar->getWidth(),
- progressBar->getY() + 4);
- progressBar->setVisible(false);
setupButton = new Button(_("Setup"), "Setup", &listener);
setupButton->setPosition(top->getWidth() - setupButton->getWidth()
- 3, 3);