summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/colour.cpp40
-rw-r--r--src/gui/colour.h46
-rw-r--r--src/gui/emotecontainer.cpp18
-rw-r--r--src/gui/emotecontainer.h24
-rw-r--r--src/gui/emoteshortcutcontainer.cpp34
-rw-r--r--src/gui/emoteshortcutcontainer.h18
-rw-r--r--src/gui/emotewindow.cpp16
-rw-r--r--src/gui/emotewindow.h14
-rw-r--r--src/gui/recorder.cpp10
-rw-r--r--src/gui/recorder.h5
-rw-r--r--src/gui/setup_colours.cpp40
-rw-r--r--src/gui/setup_colours.h44
12 files changed, 155 insertions, 154 deletions
diff --git a/src/gui/colour.cpp b/src/gui/colour.cpp
index c4505c2f..cdb5a3fd 100644
--- a/src/gui/colour.cpp
+++ b/src/gui/colour.cpp
@@ -1,23 +1,23 @@
-/***************************************************************************
- * Copyright (C) 2008 by Douglas Boffey *
- * *
- * DougABoffey@netscape.net *
- * 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 *
- * (at your option) any later version. *
- * *
- * This program is distributed with The Mana Experiment *
- * 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. *
- ***************************************************************************/
+/*
+ * Configurable text colors
+ * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
+ *
+ * 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 "colour.h"
diff --git a/src/gui/colour.h b/src/gui/colour.h
index d0349b7d..6ea02840 100644
--- a/src/gui/colour.h
+++ b/src/gui/colour.h
@@ -1,26 +1,26 @@
-/***************************************************************************
- * Copyright (C) 2008 by Douglas Boffey *
- * *
- * DougABoffey@netscape.net *
- * 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 *
- * (at your option) any later version. *
- * *
- * This program is distributed with The Mana Experiment *
- * 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 _COLOUR_H
-#define _COLOUR_H
+/*
+ * Configurable text colors
+ * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
+ *
+ * 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 COLOUR_H
+#define COLOUR_H
#include <string>
#include <vector>
diff --git a/src/gui/emotecontainer.cpp b/src/gui/emotecontainer.cpp
index fa63d4bb..94ce9736 100644
--- a/src/gui/emotecontainer.cpp
+++ b/src/gui/emotecontainer.cpp
@@ -1,22 +1,22 @@
/*
- * Aethyra
- * Copyright 2009 Aethyra Development Team
+ * Extended support for activating emotes
+ * Copyright (C) 2009 Aethyra Development Team
*
- * This file is part of Aethyra.
+ * This file is part of The Mana World.
*
- * Aethyra is free software; you can redistribute it and/or modify
+ * 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.
*
- * Aethyra is distributed in the hope that it will be useful,
+ * 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 Aethyra; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <guichan/mouseinput.hpp>
@@ -90,7 +90,7 @@ void EmoteContainer::draw(gcn::Graphics *graphics)
{
int emoteX = ((i) % columns) * gridWidth;
int emoteY = ((i) / columns) * gridHeight;
-
+
// Draw emote icon
mEmoteImg[i]->draw(static_cast<Graphics*>(graphics), emoteX, emoteY);
@@ -121,7 +121,7 @@ void EmoteContainer::recalculateHeight()
setHeight(height);
}
-int EmoteContainer::getSelectedEmote()
+int EmoteContainer::getSelectedEmote()
{
if (mSelectedEmoteIndex == NO_EMOTE)
return 0;
diff --git a/src/gui/emotecontainer.h b/src/gui/emotecontainer.h
index 5a2b8c2e..fefce793 100644
--- a/src/gui/emotecontainer.h
+++ b/src/gui/emotecontainer.h
@@ -1,26 +1,26 @@
/*
- * Aethyra
- * Copyright 2009 Aethyra Development Team
+ * Extended support for activating emotes
+ * Copyright (C) 2009 Aethyra Development Team
*
- * This file is part of Aethyra.
+ * This file is part of The Mana World.
*
- * Aethyra is free software; you can redistribute it and/or modify
+ * 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.
*
- * Aethyra is distributed in the hope that it will be useful,
+ * 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 Aethyra; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef EMOTECONTAINER_H__
-#define EMOTECONTAINER_H__
+#ifndef EMOTECONTAINER_H
+#define EMOTECONTAINER_H
#include <list>
#include <vector>
@@ -41,7 +41,7 @@ namespace gcn {
*
* \ingroup GUI
*/
-class EmoteContainer : public gcn::Widget,
+class EmoteContainer : public gcn::Widget,
public gcn::MouseListener,
public gcn::WidgetListener
{
@@ -101,8 +101,8 @@ class EmoteContainer : public gcn::Widget,
private:
/**
-
- * Sets the currently selected emote. Invalid (e.g., negative) indices set `no emotr'.
+ * Sets the currently selected emote. Invalid (e.g., negative) indices
+ * set `no emotr'.
*/
void setSelectedEmoteIndex(int index);
diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp
index e35d037f..b66592c1 100644
--- a/src/gui/emoteshortcutcontainer.cpp
+++ b/src/gui/emoteshortcutcontainer.cpp
@@ -1,22 +1,22 @@
/*
- * Aethyra
- * Copyright 2009 Aethyra Development Team
+ * Extended support for activating emotes
+ * Copyright (C) 2009 Aethyra Development Team
*
- * This file is part of Aethyra.
+ * This file is part of The Mana World.
*
- * Aethyra is free software; you can redistribute it and/or modify
+ * 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.
*
- * Aethyra is distributed in the hope that it will be useful,
+ * 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 Aethyra; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "emoteshortcutcontainer.h"
@@ -121,14 +121,14 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
void EmoteShortcutContainer::mouseDragged(gcn::MouseEvent &event)
{
- if (event.getButton() == gcn::MouseEvent::LEFT)
+ if (event.getButton() == gcn::MouseEvent::LEFT)
{
- if (!mEmoteMoved && mEmoteClicked)
+ if (!mEmoteMoved && mEmoteClicked)
{
const int index = getIndexFromGrid(event.getX(), event.getY());
const int emoteId = emoteShortcut->getEmote(index);
- if (index == -1)
+ if (index == -1)
{
return;
}
@@ -139,7 +139,7 @@ void EmoteShortcutContainer::mouseDragged(gcn::MouseEvent &event)
emoteShortcut->removeEmote(index);
}
}
- if (mEmoteMoved)
+ if (mEmoteMoved)
{
mCursorPosX = event.getX();
mCursorPosY = event.getY();
@@ -151,18 +151,18 @@ void EmoteShortcutContainer::mousePressed(gcn::MouseEvent &event)
{
const int index = getIndexFromGrid(event.getX(), event.getY());
- if (index == -1)
+ if (index == -1)
{
return;
}
// Stores the selected emote if there is one.
- if (emoteShortcut->isEmoteSelected())
+ if (emoteShortcut->isEmoteSelected())
{
emoteShortcut->setEmote(index);
emoteShortcut->setEmoteSelected(0);
}
- else if (emoteShortcut->getEmote(index))
+ else if (emoteShortcut->getEmote(index))
{
mEmoteClicked = true;
}
@@ -179,13 +179,13 @@ void EmoteShortcutContainer::mouseReleased(gcn::MouseEvent &event)
emoteShortcut->setEmoteSelected(0);
}
- if (index == -1)
+ if (index == -1)
{
mEmoteMoved = 0;
return;
}
- if (mEmoteMoved)
+ if (mEmoteMoved)
{
emoteShortcut->setEmotes(index, mEmoteMoved);
mEmoteMoved = 0;
@@ -195,7 +195,7 @@ void EmoteShortcutContainer::mouseReleased(gcn::MouseEvent &event)
emoteShortcut->useEmote(index + 1);
}
- if (mEmoteClicked)
+ if (mEmoteClicked)
{
mEmoteClicked = false;
}
diff --git a/src/gui/emoteshortcutcontainer.h b/src/gui/emoteshortcutcontainer.h
index e8d87b60..d32a9f79 100644
--- a/src/gui/emoteshortcutcontainer.h
+++ b/src/gui/emoteshortcutcontainer.h
@@ -1,26 +1,26 @@
/*
- * Aethyra
- * Copyright 2009 Aethyra Development Team
+ * Extended support for activating emotes
+ * Copyright (C) 2009 Aethyra Development Team
*
- * This file is part of Aethyra.
+ * This file is part of The Mana World.
*
- * Aethyra is free software; you can redistribute it and/or modify
+ * 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.
*
- * Aethyra is distributed in the hope that it will be useful,
+ * 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 Aethyra; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef EMOTESHORTCUTCONTAINER_H__
-#define EMOTESHORTCUTCONTAINER_H__
+#ifndef EMOTESHORTCUTCONTAINER_H
+#define EMOTESHORTCUTCONTAINER_H
#include <vector>
diff --git a/src/gui/emotewindow.cpp b/src/gui/emotewindow.cpp
index 3fa96a6d..f4a8999a 100644
--- a/src/gui/emotewindow.cpp
+++ b/src/gui/emotewindow.cpp
@@ -1,22 +1,22 @@
/*
- * Aethyra
- * Copyright 2009 Aethyra Development Team
+ * Extended support for activating emotes
+ * Copyright (C) 2009 Aethyra Development Team
*
- * This file is part of Aethyra.
+ * This file is part of The Mana World.
*
- * Aethyra is free software; you can redistribute it and/or modify
+ * 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.
*
- * Aethyra is distributed in the hope that it will be useful,
+ * 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 Aethyra; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "button.h"
@@ -29,7 +29,7 @@
#include "../localplayer.h"
-#include "../utils/gettext.h"
+#include "../utils/gettext.h"
#include "../utils/tostring.h"
EmoteWindow::EmoteWindow():
diff --git a/src/gui/emotewindow.h b/src/gui/emotewindow.h
index c642ff6f..8af24a7b 100644
--- a/src/gui/emotewindow.h
+++ b/src/gui/emotewindow.h
@@ -1,22 +1,22 @@
/*
- * Aethyra
- * Copyright 2009 Aethyra Development Team
+ * Extended support for activating emotes
+ * Copyright (C) 2009 Aethyra Development Team
*
- * This file is part of Aethyra.
+ * This file is part of The Mana World.
*
- * Aethyra is free software; you can redistribute it and/or modify
+ * 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.
*
- * Aethyra is distributed in the hope that it will be useful,
+ * 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 Aethyra; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef EMOTEWINDOW_H
diff --git a/src/gui/recorder.cpp b/src/gui/recorder.cpp
index 2e2ee8a5..c7989495 100644
--- a/src/gui/recorder.cpp
+++ b/src/gui/recorder.cpp
@@ -1,15 +1,15 @@
/*
- * The Mana World
- * Copyright 2004 The Mana World Development Team
+ * A chat recorder
+ * Copyright (C) 2008 Lloyd Bryant <lloyd_bryant@netzero.net>
*
- * This file is part of The Mana World.
+ * This file is part of Aethyra.
*
- * The Mana World is free software; you can redistribute it and/or modify
+ * 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.
*
- * The Mana World is distributed in the hope that it will be useful,
+ * 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.
diff --git a/src/gui/recorder.h b/src/gui/recorder.h
index 707f08ab..4f41ff42 100644
--- a/src/gui/recorder.h
+++ b/src/gui/recorder.h
@@ -1,6 +1,6 @@
/*
- * Aethyra
- * Copyright (C) 2008 Aethyra Development Team
+ * A chat recorder
+ * Copyright (C) 2008 Lloyd Bryant <lloyd_bryant@netzero.net>
*
* This file is part of Aethyra.
*
@@ -72,4 +72,5 @@ class Recorder : public Window, public gcn::ActionListener
std::ofstream mStream;
};
+
#endif
diff --git a/src/gui/setup_colours.cpp b/src/gui/setup_colours.cpp
index acc28b1f..49e08aeb 100644
--- a/src/gui/setup_colours.cpp
+++ b/src/gui/setup_colours.cpp
@@ -1,23 +1,23 @@
-/***************************************************************************
- * Copyright (C) 2008 by Douglas Boffey *
- * *
- * DougABoffey@netscape.net *
- * 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 *
- * (at your option) any later version. *
- * *
- * This program is distributed with The Mana Experiment *
- * 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. *
- ***************************************************************************/
+/*
+ * Configurable text colors
+ * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
+ *
+ * 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 <string>
diff --git a/src/gui/setup_colours.h b/src/gui/setup_colours.h
index f56daa60..57d9e304 100644
--- a/src/gui/setup_colours.h
+++ b/src/gui/setup_colours.h
@@ -1,26 +1,26 @@
-/***************************************************************************
- * Copyright (C) 2008 by Douglas Boffey *
- * *
- * DougABoffey@netscape.net *
- * 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 *
- * (at your option) any later version. *
- * *
- * This program is distributed with The Mana Experiment *
- * 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. *
- ***************************************************************************/
+/*
+ * Configurable text colors
+ * Copyright (C) 2008 Douglas Boffey <dougaboffey@netscape.net>
+ *
+ * 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 _SETUP_COLOURS_H
-#define _SETUP_COLOURS_H
+#ifndef SETUP_COLOURS_H
+#define SETUP_COLOURS_H
#include <string>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-08-16 01:20:31 +0000