[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/edu/kanagram/src
From: Joshua Keel <joshuakeel () gmail ! com>
Date: 2005-08-02 2:09:05
Message-ID: 1122948545.425445.5462.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 442247 by jkeel:
Remove the "standard blackboard/interface fonts" setting and replace with "standard \
interface fonts"
M +8 -14 kanagram.cpp
M +2 -2 kanagram.h
M +2 -6 kanagram.kcfg
M +30 -55 mainsettingswidget.ui
--- trunk/playground/edu/kanagram/src/kanagram.cpp #442246:442247
@@ -119,7 +119,7 @@
m_inputBox->setFont(f);
m_inputBox->show();
- m_buttonFont = KGlobalSettings::generalFont();
+ m_font = KGlobalSettings::generalFont();
}
Kanagram::~Kanagram()
@@ -133,28 +133,22 @@
m_hintHideTime = hideTime[0].digitValue();
else
m_hintHideTime = 0;
+
m_useSounds = KanagramSettings::useSounds();
- m_standardInterfaceFonts = KanagramSettings::standardInterfaceFonts();
- m_standardBlackboardFonts = KanagramSettings::standardBlackboardFonts();
- if(m_standardInterfaceFonts)
- m_font = KGlobalSettings::generalFont();
- else
- m_font = QFont("steve");
- if(m_standardBlackboardFonts)
- m_blackboardFont = KGlobalSettings::generalFont();
- else
- m_blackboardFont = QFont("squeaky chalk sound");
-
m_defaultVocab = KanagramSettings::defaultVocab();
+
+ m_useStandardFonts = KanagramSettings::useStandardFonts();
- if(m_standardBlackboardFonts)
+ if(m_useStandardFonts)
{
+ m_blackboardFont = KGlobalSettings::generalFont();
m_arrow = new QPixmap(locate("appdata", "images/basicarrow.png"));
m_arrowOver = new QPixmap(locate("appdata", "images/basicarrowover.png"));
}
else
{
+ m_blackboardFont = QFont("squeaky chalk sound");
m_arrow = new QPixmap(locate("appdata", "images/arrow.png"));
m_arrowOver = new QPixmap(locate("appdata", "images/arrowover.png"));
}
@@ -196,7 +190,7 @@
drawText(p, i18n("reveal word"), QPoint(336, 353), false, 0, 0, 0, m_overReveal, \
true, m_blackboardFont, m_chalkColor, m_chalkHighlightColor, 14); drawText(p, \
i18n("hint"), QPoint(70, 353), false, 0, 0, 0, m_overHint, true, m_blackboardFont, \
m_chalkColor, m_chalkHighlightColor, 14);
- drawText(p, i18n("Try"), QPoint(369, 442), true, 10, 5, &m_tryRect, m_overTry, \
true, m_buttonFont, QColor(126, 126, 126), m_chalkHighlightColor); + drawText(p, \
i18n("Try"), QPoint(369, 442), true, 10, 5, &m_tryRect, m_overTry, true, m_font, \
QColor(126, 126, 126), m_chalkHighlightColor);
drawSwitcherText(p, m_game.getDocTitle());
if(m_overSwitcher)
--- trunk/playground/edu/kanagram/src/kanagram.h #442246:442247
@@ -85,10 +85,10 @@
//Values for settings
int m_hintHideTime;
- bool m_useSounds, m_standardBlackboardFonts, m_standardInterfaceFonts;
+ bool m_useSounds, m_useStandardFonts;
QString m_defaultVocab;
- QFont m_font, m_blackboardFont, m_buttonFont;
+ QFont m_blackboardFont, m_font;
KHelpMenu *m_helpMenu;
--- trunk/playground/edu/kanagram/src/kanagram.kcfg #442246:442247
@@ -8,14 +8,10 @@
<label>Turns on sound effects</label>
<default>true</default>
</entry>
-<entry name="standardInterfaceFonts" type="Bool">
- <label>Uses a standard font for the interface</label>
+<entry name="useStandardFonts" type="Bool">
+ <label>Uses a standard font</label>
<default>false</default>
</entry>
-<entry name="standardBlackboardFonts" type="Bool">
- <label>Uses a standard font for the blackboard</label>
- <default>false</default>
-</entry>
<entry name="defaultVocab" type="Path">
<label>Set the default vocabulary</label>
<default>/usr/share/apps/kanagram/data/objects.kvtml</default>
--- trunk/playground/edu/kanagram/src/mainsettingswidget.ui #442246:442247
@@ -8,8 +8,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>340</width>
- <height>186</height>
+ <width>210</width>
+ <height>175</height>
</rect>
</property>
<property name="caption">
@@ -19,6 +19,28 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
+ <widget class="QCheckBox" row="4" column="0">
+ <property name="name">
+ <cstring>kcfg_useStandardFonts</cstring>
+ </property>
+ <property name="text">
+ <string>Use standard fonts</string>
+ </property>
+ <property name="accel">
+ <string></string>
+ </property>
+ </widget>
+ <widget class="QCheckBox" row="3" column="0">
+ <property name="name">
+ <cstring>kcfg_useSounds</cstring>
+ </property>
+ <property name="text">
+ <string>Use sou&nds</string>
+ </property>
+ <property name="accel">
+ <string>Alt+N</string>
+ </property>
+ </widget>
<widget class="QLayoutWidget" row="0" column="0">
<property name="name">
<cstring>layout5</cstring>
@@ -67,18 +89,10 @@
</widget>
</grid>
</widget>
- <widget class="QCheckBox" row="3" column="0">
+ <spacer row="2" column="0">
<property name="name">
- <cstring>kcfg_useSounds</cstring>
+ <cstring>spacer1</cstring>
</property>
- <property name="text">
- <string>Use sou&nds</string>
- </property>
- </widget>
- <spacer row="0" column="0">
- <property name="name">
- <cstring>spacer1_2</cstring>
- </property>
<property name="orientation">
<enum>Vertical</enum>
</property>
@@ -87,14 +101,14 @@
</property>
<property name="sizeHint">
<size>
- <width>16</width>
- <height>1</height>
+ <width>20</width>
+ <height>20</height>
</size>
</property>
</spacer>
<spacer row="1" column="0">
<property name="name">
- <cstring>spacer1</cstring>
+ <cstring>spacer1_2</cstring>
</property>
<property name="orientation">
<enum>Vertical</enum>
@@ -105,54 +119,15 @@
<property name="sizeHint">
<size>
<width>16</width>
- <height>3</height>
+ <height>16</height>
</size>
</property>
</spacer>
- <widget class="QGroupBox" row="4" column="0">
- <property name="name">
- <cstring>groupBox2</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title">
- <string>Fonts</string>
- </property>
- <grid>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QCheckBox" row="0" column="0">
- <property name="name">
- <cstring>kcfg_standardInterfaceFonts</cstring>
- </property>
- <property name="text">
- <string>&Use standard fonts for interface</string>
- </property>
- </widget>
- <widget class="QCheckBox" row="1" column="0">
- <property name="name">
- <cstring>kcfg_standardBlackboardFonts</cstring>
- </property>
- <property name="text">
- <string>Use standard fonts for &blackboard</string>
- </property>
- </widget>
- </grid>
- </widget>
</grid>
</widget>
<tabstops>
<tabstop>kcfg_hintHideTime</tabstop>
<tabstop>kcfg_useSounds</tabstop>
- <tabstop>kcfg_standardInterfaceFonts</tabstop>
- <tabstop>kcfg_standardBlackboardFonts</tabstop>
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
</UI>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic