Permalink
Browse files

version-bump to 1.2.5

  • Loading branch information...
onli committed Apr 13, 2012
1 parent f8e2a65 commit 57679b68e76d68901c740fad7923f8eb8014bf33
Showing with 1 addition and 24 deletions.
  1. +0 −23 src/main.cc
  2. +1 −1 src/main.h
View
@@ -73,30 +73,7 @@ wxString questionPath = _T (DATA_DIR "/question.png");
bool
loadSettings (simSettings* settings)
{
- // Loading default settings
- //struct simSettings data ;
- /*
- { LEFT_BORDER, RIGHT_BORDER, BOTTOM_BORDER, ICONW, ICONH,
- PERCENT, RANGE,
- SPACER, BG_HEIGHT, bgPath, SHOW_REFLEXES,
- REFLEX_SCALING, REFLEX_ALPHA
- };*/
simGconf_loadSettings (settings);
- /*
- LEFT_BORDER = data.LEFT_BORDER;
- RIGHT_BORDER = data.RIGHT_BORDER;
- BOTTOM_BORDER = data.BOTTOM_BORDER;
- ICONW = data.ICONW;
- ICONH = data.ICONH;
- PERCENT = data.PERCENT;
- RANGE = data.RANGE;
- SPACER = data.SPACER;
- BG_HEIGHT = data.BG_HEIGHT;
- bgPath = data.BG_PATH;
- SHOW_REFLEXES = data.SHOW_REFLEXES;
- REFLEX_SCALING = data.REFLEX_SCALING;
- REFLEX_ALPHA = data.REFLEX_ALPHA;
-*/
simGconf_loadPosition (&startPositionX, &startPositionY);
settings->MAXSIZE = settings->ICONW + settings->ICONW * settings->PERCENT / 100;
View
@@ -64,7 +64,7 @@ class simSettings;
class MyApp;
WX_DEFINE_ARRAY (simImage *, ImagesArray);
-#define SIMDOCK_VERSION "1.2.1"
+#define SIMDOCK_VERSION "1.2.5"
#define SIMDOCK_WEBSITE "http://sourceforge.net/projects/simdock"
//#define SIMDOCK_DEBUG
//#define SIMDOCK_DEBUG_ICON_POSITIONING //this is very verbose

0 comments on commit 57679b6

Please sign in to comment.