adding application icon

and trying to add actor icon. but this is really hackish

11 files changed, 56 insertions, 7 deletions

diff --git a/pacman-c++/client.cpp b/pacman-c++/client.cpp
index cf3c291..47bbc4e 100644
--- a/pacman-c++/client.cpp
+++ b/pacman-c++/client.cpp
@@ -16,6 +16,7 @@ Client::Client()
 int main(int argc, char ** argv) {
   QApplication app(argc, argv);
   app.setApplicationName("pacman-client");
+  app.setWindowIcon(QIcon(":/appicon"));
 
   qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime()));
 
diff --git a/pacman-c++/mainwidget.cpp b/pacman-c++/mainwidget.cpp
index 780312f..e8a4250 100644
--- a/pacman-c++/mainwidget.cpp
+++ b/pacman-c++/mainwidget.cpp
@@ -46,7 +46,6 @@ Transmission::map_t createDummyMap()
     "             #       #             "
   };
 
-
   for (unsigned int x = 0; x < Constants::map_size.width; ++x)
   {
     for (unsigned int y = 0; y < Constants::map_size.height; ++y)
@@ -114,11 +113,12 @@ void MainWidget::createGui()
 
   for (unsigned int i = 1; i < 4; ++i)
   {
-    QGroupBox *scoreBoxI = new QGroupBox(QString("Spieler %1").arg(i), this);
-    m_scoreLayout->addWidget(scoreBoxI);
+    QGroupBox *scoreBox = new QGroupBox(QString("     Spieler %1").arg(i), this);
+    scoreBox->setObjectName(QString("actor%1").arg(i));
+    m_scoreLayout->addWidget(scoreBox);
 
     QGridLayout *playerLayout = new QGridLayout();
-    scoreBoxI->setLayout(playerLayout);
+    scoreBox->setLayout(playerLayout);
 
     playerLayout->addWidget(new QLabel("Rundenpunkte:", this), 0, 0);
     playerLayout->addWidget(new QLabel("Gesamtpunkte:", this), 1, 0);
@@ -126,6 +126,12 @@ void MainWidget::createGui()
     playerLayout->addWidget(new QLabel("", this), 0, 1);
     playerLayout->addWidget(new QLabel("", this), 1, 1);
 
+    /*Actor *tmp1 = new Actor(Color::red);
+    QGraphicsScene *tmp2 = new QGraphicsScene(0, 0, 16, 16, this);
+    QLabel *tmp3 = new QLabel("hfghgfhgfhgfh", this);
+    tmp3->setPixmap(QPixmap(":/actor1"));
+    playerLayout->addWidget(tmp3, 0, 2);*/
+
     m_playerScoreLayouts.append(playerLayout);
   }
 
@@ -135,16 +141,19 @@ void MainWidget::createGui()
   QGraphicsView *window = new QGraphicsView(m_scene, this);
   window->setFrameStyle(0);
   window->setAlignment(Qt::AlignLeft | Qt::AlignTop);
-  //window->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-  //window->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
   window->setFixedSize(Constants::map_size_pixel.width, Constants::map_size_pixel.height);
   window->setWindowFlags(window->windowFlags() & ~Qt::WindowMaximizeButtonHint);
 
   layout->addLayout(m_scoreLayout);
   layout->addWidget(window);
 
+  QFile css(":/stylesheet");
+  css.open(QFile::ReadOnly);
+  qApp->setStyleSheet(QLatin1String(css.readAll()));
+
   setLayout(layout);
-  setWindowTitle("pacman client");
+  //TODO: this doesn't work?!?!
+  setWindowTitle("FOOP Pacman Client");
 }
 
 void MainWidget::updateScore()
diff --git a/pacman-c++/pacman.pro b/pacman-c++/pacman.pro
index 68d1be9..e995c81 100644
--- a/pacman-c++/pacman.pro
+++ b/pacman-c++/pacman.pro
@@ -20,5 +20,10 @@ RESOURCES += pacman.qrc
 
 OBJECTS_DIR = .obj
 MOC_DIR = .moc
+RC_FILE = pacman.rc
 
 CONFIG += debug
+
+OTHER_FILES += \
+    style.qss \
+    pacman.rc
diff --git a/pacman-c++/pacman.qrc b/pacman-c++/pacman.qrc
index 3752ebe..ceb032a 100644
--- a/pacman-c++/pacman.qrc
+++ b/pacman-c++/pacman.qrc
@@ -11,6 +11,12 @@
         <file alias="block4">pics/block4.png</file>
         <file alias="bonuspoints">pics/bonuspoints.png</file>
         <file alias="points">pics/points.png</file>
+        <file alias="stylesheet">style.qss</file>
+        <file alias="appicon">pics/app.ico</file>
+        <file alias="actor1icon">pics/actor1icon.png</file>
+        <file alias="actor2icon">pics/actor2icon.png</file>
+        <file alias="actor3icon">pics/actor3icon.png</file>
+        <file alias="actor4icon">pics/actor4icon.png</file>
     </qresource>
     <qresource prefix="/sound">
         <file alias="wakawaka">sound/waka_waka.ogg</file>
diff --git a/pacman-c++/pacman.rc b/pacman-c++/pacman.rc
new file mode 100644
index 0000000..808718b
--- /dev/null
+++ b/pacman-c++/pacman.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "pics/pacman.ico"
diff --git a/pacman-c++/pics/actor1icon.png b/pacman-c++/pics/actor1icon.png
new file mode 100644
index 0000000..4407cef
--- /dev/null
+++ b/pacman-c++/pics/actor1icon.png
diff --git a/pacman-c++/pics/actor2icon.png b/pacman-c++/pics/actor2icon.png
new file mode 100644
index 0000000..eaf2a4c
--- /dev/null
+++ b/pacman-c++/pics/actor2icon.png
diff --git a/pacman-c++/pics/actor3icon.png b/pacman-c++/pics/actor3icon.png
new file mode 100644
index 0000000..2558cbc
--- /dev/null
+++ b/pacman-c++/pics/actor3icon.png
diff --git a/pacman-c++/pics/actor4icon.png b/pacman-c++/pics/actor4icon.png
new file mode 100644
index 0000000..82bf637
--- /dev/null
+++ b/pacman-c++/pics/actor4icon.png
diff --git a/pacman-c++/pics/app.ico b/pacman-c++/pics/app.ico
new file mode 100644
index 0000000..4a73cd4
--- /dev/null
+++ b/pacman-c++/pics/app.ico
diff --git a/pacman-c++/style.qss b/pacman-c++/style.qss
new file mode 100644
index 0000000..74ba1b8
--- /dev/null
+++ b/pacman-c++/style.qss
@@ -0,0 +1,27 @@
+QGroupBox#actor1::title {
+    background-image: url(:/actor1icon);
+    background-position: top left;
+    background-repeat: no-repeat;
+    background-color: palette(window);
+}
+
+QGroupBox#actor2::title {
+    background-image: url(:/actor2icon);
+    background-position: top left;
+    background-repeat: no-repeat;
+    background-color: palette(window);
+}
+
+QGroupBox#actor3::title {
+    background-image: url(:/actor3icon);
+    background-position: top left;
+    background-repeat: no-repeat;
+    background-color: palette(window);
+}
+
+QGroupBox#actor4::title {
+    background-image: url(:/actor4icon);
+    background-position: top left;
+    background-repeat: no-repeat;
+    background-color: palette(window);
+}