[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [pairs/new_qml2] src: Don't cache if it's not needed.
From:       Aleix Pol <aleixpol () kde ! org>
Date:       2011-11-30 21:57:56
Message-ID: 20111130215756.77FECA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 7a7ac188d48925c5f3daa77a646fd3223c8cd5f2 by Aleix Pol.
Committed on 30/11/2011 at 22:23.
Pushed by apol into branch 'new_qml2'.

Don't cache if it's not needed.
Clean up QML a little

M  +5    -1    src/playersmodel.cpp
M  +1    -2    src/playersmodel.h
M  +6    -13   src/qml/Main.qml
M  +6    -6    src/qml/OptionsPage.qml

http://commits.kde.org/pairs/7a7ac188d48925c5f3daa77a646fd3223c8cd5f2

diff --git a/src/playersmodel.cpp b/src/playersmodel.cpp
index 86d65ae..f1c9cd9 100644
--- a/src/playersmodel.cpp
+++ b/src/playersmodel.cpp
@@ -36,7 +36,6 @@ PlayersModel::PlayersModel(QObject* parent)
     names.insert(Time, "time");
     setRoleNames(names);
     m_playerIcons = KGlobal::dirs()->findAllResources("appdata", QLatin1String( "players/*.png"));
-    m_gameicons = KGlobal::dirs()->findResourceDir("appdata", QLatin1String( "gameicons/pairs.png"));
 
     refresh();
 }
@@ -151,3 +150,8 @@ void PlayersModel::removePlayers()
      changePersistentIndex(index(0,0), index(rowCount(),columnCount()));
      emit layoutChanged();
 }
+
+QString PlayersModel::iconsDir(const QString& path)
+{
+    return "file://"+KGlobal::dirs()->findResource("appdata", path);
+}
diff --git a/src/playersmodel.h b/src/playersmodel.h
index 41106ea..3bef453 100644
--- a/src/playersmodel.h
+++ b/src/playersmodel.h
@@ -47,13 +47,12 @@ class PlayersModel : public QStandardItemModel
         QString randomIcon();
         void gameStarted();
         void newGame();
-        QString iconsDir(){return m_gameicons;};
+        QString iconsDir(const QString& path);
 
     
     private:
         void refresh();
         QStringList m_playerIcons;
-        QString m_gameicons;
 };
 
 
diff --git a/src/qml/Main.qml b/src/qml/Main.qml
index e15879c..d41852b 100644
--- a/src/qml/Main.qml
+++ b/src/qml/Main.qml
@@ -79,12 +79,12 @@ Rectangle
         
         Row{
             Button {
-                source: "file://"+playersModel.iconsDir()+"gameicons/get-hot-new-stuff.png"
+                source: playersModel.iconsDir("gameicons/get-hot-new-stuff.png")
                 text: "Download Themes"
                 onClicked: fgame.download()
             }
             Button {
-                source: "file://"+playersModel.iconsDir()+"gameicons/newgame.png"
+                source: playersModel.iconsDir("gameicons/newgame.png")
                 text: "New Game"
                 visible: game.state=="playing"
                 onClicked: {
@@ -93,7 +93,7 @@ Rectangle
                 }
             }
             Button {
-                source: "file://"+playersModel.iconsDir()+"gameicons/quit.png"
+                source: playersModel.iconsDir("gameicons/quit.png")
                 text: "Quit"
                 onClicked: {
                     Qt.quit()
@@ -109,14 +109,7 @@ Rectangle
                 height: 120
                 function toggle() {
                     playersModel.setSelected(index)
-                    if(state == "on") 
-                    { 
-                        state = "off"
-                    } 
-                    else 
-                    { 
-                        state = "on" 
-                    }
+                    state = state=="on" ? "off" : "on"
                 }
                 property bool on: false // variable for outside world
                 state: "on"
@@ -195,12 +188,12 @@ Rectangle
             }
             Button { 
                 text: "Add"; 
-                source: "file://"+playersModel.iconsDir()+"gameicons/list-add-user.png"
+                source: playersModel.iconsDir("gameicons/list-add-user.png")
                 onClicked: playersModel.addPlayer(playerName.text, newUserPicture.source) 
             }
             Button { 
                 text: "Delete Selected"; 
-                source: "file://"+playersModel.iconsDir()+"gameicons/list-remove-user.png"
+                source: playersModel.iconsDir("gameicons/list-remove-user.png")
                 onClicked: playersModel.removePlayers() 
             }
         }
diff --git a/src/qml/OptionsPage.qml b/src/qml/OptionsPage.qml
index ceb25e6..6ace892 100644
--- a/src/qml/OptionsPage.qml
+++ b/src/qml/OptionsPage.qml
@@ -17,7 +17,7 @@ Rectangle {
             Row {
                 spacing: 20
                 Button {
-                    source: "file://"+playersModel.iconsDir()+"gameicons/pairs.png"
+                    source: playersModel.iconsDir("gameicons/pairs.png")
                     text: "Pairs"
                     onClicked: {
                         gametype = 'image';
@@ -25,7 +25,7 @@ Rectangle {
                     }
                 }
                 Button {
-                    source: "file://"+playersModel.iconsDir()+"gameicons/pairs2.png"
+                    source: playersModel.iconsDir("gameicons/pairs2.png")
                     text: "Pairs 2"
                     onClicked: {
                         gametype = 'image2';
@@ -33,7 +33,7 @@ Rectangle {
                     }
                 }
                 Button {
-                    source: "file://"+playersModel.iconsDir()+"gameicons/logic.png"
+                    source: playersModel.iconsDir("gameicons/logic.png")
                     text: "Logic"
                     onClicked: {
                         gametype = 'logic';
@@ -41,7 +41,7 @@ Rectangle {
                     }
                 }
                 Button {
-                    source: "file://"+playersModel.iconsDir()+"gameicons/sound.png"
+                    source: playersModel.iconsDir("gameicons/sound.png")
                     text: "Sound"
                     onClicked: {
                         gametype = 'sound';
@@ -49,7 +49,7 @@ Rectangle {
                     }
                 }
                 Button {
-                    source: "file://"+playersModel.iconsDir()+"gameicons/sound.png"
+                    source: playersModel.iconsDir("gameicons/sound.png")
                     text: "SoundLogic"
                     onClicked: {
                         gametype = 'soundlogic';
@@ -57,7 +57,7 @@ Rectangle {
                     }
                 }
                 Button {
-                    source: "file://"+playersModel.iconsDir()+"gameicons/words.png"
+                    source: playersModel.iconsDir("gameicons/words.png")
                     text: "Words"
                     onClicked: {
                         gametype = 'word';

[prev in list] [next in list] [prev in thread] [next in thread]