Index: bigclock/bigclock.c diff -u bigclock/bigclock.c:1.109 bigclock/bigclock.c:1.105 --- bigclock/bigclock.c:1.109 Wed Jan 10 18:03:10 2007 +++ bigclock/bigclock.c Mon May 15 18:29:40 2006 @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Copyright (C) 1998-2001 Jens Rupp -Copyright (C) 2006-2007 Yoshizumi Endo +Copyright (C) 2006 Yoshizumi Endo Written by Jens Rupp jens@gacel.de @@ -44,7 +44,7 @@ { {2000,300,0}, {4000,300,0}, {2000,200,0}, {4000,200,20}} }; //96 -int inot[2] = {1,0}; +const int inot[2] = {1,0}; #ifdef debug static HostFILEType *log; @@ -503,7 +503,6 @@ prefs.mode=0; prefs.pageset=0; prefs.holidaysautoupdate=1; - prefs.pluggedon=0; ampm=!Use24HourFormat(SysPref.timeFormat); if (ampm) @@ -2649,16 +2648,11 @@ } else { CtlSetValue(FrmGetObjectPtr(form,FrmGetObjectIndex(form,buttonID_m1+prefs.mode)),0); - - if (event->data.keyDown.chr == pageDownChr - /* || (event->data.keyDown.chr >= hard1Chr && - event->data.keyDown.chr <= hard4Chr) */ ) + if (event->data.keyDown.chr == pageDownChr) { if (prefs.mode<3) prefs.mode++; - else - prefs.mode=0; - + else prefs.mode=0; SwitchDraw(); handled = 1; } @@ -2666,17 +2660,13 @@ { if (prefs.mode>0) prefs.mode--; - else - prefs.mode=3; - + else prefs.mode=3; SwitchDraw(); handled = 1; } - CtlSetValue(FrmGetObjectPtr(form,FrmGetObjectIndex(form,buttonID_m1+prefs.mode)),1); } break; - case penDownEvent: if ( (event->screenY >= ytop/xHR) && (event->screenY <= (ybottom/xHR+panelheight)) ) { Index: bigclock/bigclock.rcp diff -u bigclock/bigclock.rcp:1.72 bigclock/bigclock.rcp:1.69 --- bigclock/bigclock.rcp:1.72 Wed Jan 10 18:04:30 2007 +++ bigclock/bigclock.rcp Tue May 23 00:18:18 2006 @@ -2,7 +2,7 @@ #include "ja.rcp" #include "de.rcp" -#define BCLKVERSION "2.83c-ye5.1" +#define BCLKVERSION "2.83c-ye5" TRANSLATION "ENGLISH" BEGIN @@ -196,7 +196,7 @@ GRAFFITISTATEINDICATOR AT (142 PREVTOP+2) END -FORM ID formID_global AT ( 2 38 156 120) +FORM ID formID_global AT ( 2 52 156 106) USABLE MODAL BEGIN @@ -206,7 +206,6 @@ CHECKBOX "Ignore system alarm sound off" ID checkboxID_soundoff AT (PREVLEFT PREVBOTTOM+1 AUTO AUTO) FONT 0 CHECKBOX "Lock timer layout" ID checkboxID_locktimer AT (PREVLEFT PREVBOTTOM+1 AUTO AUTO) FONT 0 CHECKBOX "Always start on first page" ID checkboxID_startfirst AT (PREVLEFT PREVBOTTOM+1 AUTO AUTO) FONT 0 - CHECKBOX "Stay on if plugged in" ID checkboxID_pluggedon AT (PREVLEFT PREVBOTTOM+1 AUTO AUTO) FONT 0 CHECKBOX "Auto update of holidays data" ID checkboxID_holidaysauto AT (PREVLEFT PREVBOTTOM+1 AUTO AUTO) FONT 0 BUTTON "Ok" ID buttonID_ok AT (5 PREVTOP+21 36 AUTO) @@ -483,7 +482,7 @@ FORMBITMAP at (PREVLEFT-10 PREVTOP+1) BITMAP bitmapID_copy //LABEL "2002 Ling Nero." AUTOID AT (PREVLEFT+10 PREVTOP+11) //FORMBITMAP at (PREVLEFT-10 PREVTOP+1) BITMAP bitmapID_copy - LABEL "2006-2007 Yoshizumi Endo." AUTOID AT (PREVLEFT+10 PREVTOP+11) + LABEL "2006 Yoshizumi Endo." AUTOID AT (PREVLEFT+10 PREVTOP+11) FORMBITMAP at (PREVLEFT-10 PREVTOP+1) BITMAP bitmapID_copy LABEL "copyright_1" AUTOID AT (PREVLEFT PREVTOP+16) @@ -603,7 +602,7 @@ "Modified to not mess up Clie hi-res screens after alarm triggered.\n\n"\ "Copyleft 2002, 2003 Free Software Foundation.\n"\ "FreeSans Font on HiRes mode.\n\n"\ -"Copyright 2006-2007 Yoshizumi Endo.\n"\ +"Copyright 2006 Yoshizumi Endo.\n"\ "Added some Japanese translations and HiRes mode support." HEX "hSTR" ID stringID_help Index: bigclock/bigclockrcp.h diff -u bigclock/bigclockrcp.h:1.5 bigclock/bigclockrcp.h:1.4 --- bigclock/bigclockrcp.h:1.5 Sun Nov 12 05:43:56 2006 +++ bigclock/bigclockrcp.h Mon May 15 00:46:41 2006 @@ -286,7 +286,6 @@ #define checkboxID_holidaysauto 1742 #define checkboxID_alwayssyscolor 1743 #define checkboxID_transbuttons 1744 -#define checkboxID_pluggedon 1745 //selector 1800 #define selectorID_reldate 1800 Index: bigclock/bigclocktypes.h diff -u bigclock/bigclocktypes.h:1.12 bigclock/bigclocktypes.h:1.11 --- bigclock/bigclocktypes.h:1.12 Sun Nov 12 05:43:13 2006 +++ bigclock/bigclocktypes.h Fri Apr 28 01:00:30 2006 @@ -144,7 +144,6 @@ Word locktimer:1; Word startfirst:1; Word holidaysautoupdate:1; - Word pluggedon:1; Word alwayssyscolor:1; Word transbutton:1; } BigClockPrefType; Index: bigclock/draw.c diff -u bigclock/draw.c:1.92 bigclock/draw.c:1.90 --- bigclock/draw.c:1.92 Mon Nov 13 01:57:56 2006 +++ bigclock/draw.c Mon May 15 03:28:13 2006 @@ -945,7 +945,6 @@ } } -/* Draw Date & Time for Count Down/UP Timer */ void DrawTime2(int y,int d,int h,int m,int s,Boolean small) { @@ -967,7 +966,7 @@ time[7]=(m % 10) + '0'; if (small) - MyDrawChars(time,StrLen(time),0,y*xHR,false); + MyDrawChars(time,StrLen(time),0,y,false); else { int offset=0; @@ -2172,15 +2171,6 @@ WinCopyRectangle(build,old,&all,0,y,winPaint); } - if (prefs.pluggedon) - { - Boolean pluggedIn; - - SysBatteryInfo(false, NULL, NULL, NULL, NULL, &pluggedIn, NULL); - if (pluggedIn == true) - EvtResetAutoOffTimer(); - } - #ifdef debug debugs("SwitchDrawSection","done"); #endif Index: bigclock/ja.rcp diff -u bigclock/ja.rcp:1.40 bigclock/ja.rcp:1.38 --- bigclock/ja.rcp:1.40 Wed Jan 10 18:04:30 2007 +++ bigclock/ja.rcp Mon May 15 00:46:41 2006 @@ -2,7 +2,7 @@ Copyright (C) 1998-2001 Jens Rupp Copyright (C) 1999 Tetsuji Yoshikawa -Copyright (C) 2006-2007 Yoshizumi Endo +Copyright (C) 2006 Yoshizumi Endo */ @@ -111,7 +111,6 @@ "Ignore system alarm sound off"="システムのアラームオフを無視" "Lock timer layout"="タイマーのレイアウトをロック" "Always start on first page"="起動時に基準時計を開く" - "Stay on if plugged in"="クレードル上で常時オン" "Auto update of holidays data"="祝日データの自動更新" "Holidays data update"="祝日データの更新" @@ -286,7 +285,7 @@ "Multifunctional Clock"="多機能時計" "About BigClock"="BigClock" - "2006-2007 Yoshizumi Endo."="2006-2007 遠藤 美純." + "2006 Yoshizumi Endo."="2006 遠藤 美純." "copyright_1"="本プログラムは GPL の元で配布さ" "copyright_2"="れるフリーソフトウェアです。他" @@ -302,7 +301,7 @@ ="Copyleft 2002, 2003 フリーソフトウェア財団.\n" "FreeSans Font on HiRes mode.\n\n" ="本プログラムがハイレゾモードで利用しているフォントはフリーソフトウェア財団の FreeSans フォントを改変したものです。\n\n" - "Copyright 2006-2007 Yoshizumi Endo.\n" ="Copyright 2006-2007 遠藤 美純.\n" + "Copyright 2006 Yoshizumi Endo.\n" ="Copyright 2006 遠藤 美純.\n" "Added some Japanese translations and HiRes mode support." ="日本語メッセージ翻訳およびハイレゾモードサポートの追加など" Index: bigclock/option.c diff -u bigclock/option.c:1.30 bigclock/option.c:1.25 --- bigclock/option.c:1.30 Mon Nov 13 20:33:15 2006 +++ bigclock/option.c Mon May 15 03:29:01 2006 @@ -11,7 +11,7 @@ static char *ThemeList[maxthemes]; static char optionpage=0; -extern int inot[2]; +extern const int inot[2]; static void SetLayoutLabels() SEG_OPTION; #ifdef _GotHelp_ @@ -559,7 +559,6 @@ SetCheckBox(checkboxID_locktimer,prefs.locktimer); SetCheckBox(checkboxID_startfirst,prefs.startfirst); SetCheckBox(checkboxID_holidaysauto,prefs.holidaysautoupdate); - SetCheckBox(checkboxID_pluggedon,prefs.pluggedon); FrmDrawForm(form); handled = 1; @@ -592,9 +591,6 @@ } else if (event->data.ctlEnter.controlID == checkboxID_holidaysauto) { prefs.holidaysautoupdate=GetCheckBox(checkboxID_holidaysauto); - } else if (event->data.ctlEnter.controlID == checkboxID_pluggedon) - { - prefs.pluggedon=GetCheckBox(checkboxID_pluggedon); } break; @@ -827,25 +823,7 @@ if (event->eType == frmOpenEvent) { - int val; - unsigned char pan; - - val = prefs.pages[prefs.pageset][prefs.mode*2]; - pan = val >> 3; - - if ((pan > pnVTimer) || (pan < pnAlarm)) - { - val = prefs.pages[prefs.pageset][prefs.mode*2+1]; - pan = val >> 3; - } - - /* obase is a selected menu item. */ - if ((pan == pnAlarm && obase == wAlarm1) || - ((pan <= pnVTimer) && (pan >= pnTimer) && (obase == wTimer1))) - optionpage = val & 7; - else - optionpage = 0; - + optionpage=0; SetAlarmOptions(optionpage); SetCheckBox(buttonID_m1 + optionpage, 1); #ifdef _TRG_ @@ -965,15 +943,7 @@ bco2->alternate=bco->alternate; } else if (event->data.ctlEnter.controlID == checkboxID_calc) { - char num[8]; - - GetFieldText(editID_calc, num); - - if (StrAToI(num) == 0) - bco->calc=0; - else - bco->calc=GetCheckBox(checkboxID_calc); - + bco->calc=GetCheckBox(checkboxID_calc); } else if (event->data.ctlEnter.controlID == popupID_trigger) { index = FrmGetObjectIndex(form, popuplistID_trigger); @@ -1174,9 +1144,6 @@ RectangleType rc = {{50,50},{60,60}}; char label_stop[10]; - int val; - unsigned char pan; - #ifdef _TRG_ if (isTRG) { @@ -1198,22 +1165,7 @@ } #endif - val = prefs.pages[prefs.pageset][prefs.mode*2]; - pan = val >> 3; - - if ((pan != pnAlarm) && (pan != pnControl)) - { - val = prefs.pages[prefs.pageset][prefs.mode*2+1]; - pan = val >> 3; - } - - if (pan == pnAlarm) - obase = prefs.world[wAlarm1 + (val & 7)].options.sound; - else if (pan == pnControl) - obase = prefs.world[wTimer1 + (val & 7)].options.sound; - else - obase= 0; - + obase=0; SetCheckBox(buttonID_m1 + obase, 1); MidiListInit();