Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSoaS user <liveuser@localhost.localdomain>2010-03-02 17:58:59 (GMT)
committer SoaS user <liveuser@localhost.localdomain>2010-03-02 17:58:59 (GMT)
commitfb9f1eda2fadf9d7c053861d7abaf9c6c4c7d569 (patch)
tree629bda6b25647a1f2f11d47cb487a12652ef4e64
parentf1c594f45dea6580b3bfb50a47c0ac58a94b80f7 (diff)
auto default font sizing for XO's and versions of SoaS through 0.88
-rw-r--r--activity/activity.info2
-rw-r--r--csndsugui.py7
-rw-r--r--ourmusicmc.py8
3 files changed, 9 insertions, 8 deletions
diff --git a/activity/activity.info b/activity/activity.info
index 1f0266c..41527bc 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -5,7 +5,7 @@ name = OurMusicMC
bundle_id = org.laptop.OurMusicMC
icon = activity-ourmusicmc
-activity_version = 2
+activity_version = 3
host_version = 1
diff --git a/csndsugui.py b/csndsugui.py
index d97e279..5f7574e 100644
--- a/csndsugui.py
+++ b/csndsugui.py
@@ -60,10 +60,13 @@ class BasicGUI:
if os.path.exists("/etc/olpc-release") or os.path.exists("/etc/power/olpc-pm"):
mult = width * .00082
elif os.path.exists("/etc/fedora-release"):
- if open("/etc/fedora-release").read().find("Strawberry") != -1:
+ release = open("/etc/fedora-release").read()
+ if release.find("SoaS release 1 ") != -1:
mult = width * .00132
- elif open("/etc/fedora-release").read().find("Blueberry") != -1:
+ elif release.find("SoaS release 2 ") != -1:
mult = width * .00085
+ elif release.find("SoaS release 3 ") != -1:
+ mult = width * .00119
font.set_size(int(font_size * mult))
widget.modify_font(font)
diff --git a/ourmusicmc.py b/ourmusicmc.py
index 888ccb3..b63e46f 100644
--- a/ourmusicmc.py
+++ b/ourmusicmc.py
@@ -12,11 +12,8 @@
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
#
-# version 2 12/18/09 Additions:
-# optional scrollbars
-# auto default font sizing for XO and all versions of SoaS
-# ready for basic font size adjustment by user or deployment
-# works with SoaS Strawberry (Sugar 0.84) after installing csound-python
+# version 3 2/26/10 Additions:
+# auto default font sizing for XO's and versions of SoaS through 0.88
#
# Notes:
#
@@ -307,3 +304,4 @@ Q-I tones (8) on/off\n[A-; harmonics (10)]\n[Z-/ pan position]\n\
self.but = self.w.cbbutton(self.b3, self.playcsd, "START !")
self.but.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color(0, 0x7700, 0))
self.but.modify_bg(gtk.STATE_PRELIGHT, gtk.gdk.Color(0, 0x7700, 0))
+