Menu
▾
▴
progect-cvs — List that posts CVS commits for Progect
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
(8) |
Mar
(65) |
Apr
(7) |
May
(4) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27372 Modified Files: Tag: OBJECT_INTERNALS_BRANCH Makefile progect.h progect.rcp Added Files: Tag: OBJECT_INTERNALS_BRANCH progect-cs.rcp progect-de.rcp progect-en.rcp progect-es.rcp progect-fr.rcp progect-it.rcp progect-ja.rcp progect-ko.rcp progect-sk.rcp progect-zh.rcp Removed Files: Tag: OBJECT_INTERNALS_BRANCH cs.rcp de.rcp es.rcp fr.rcp it.rcp ja.rcp ko.rcp sk.rcp zh.rcp Log Message: Trying to get things compiling better. --- it.rcp DELETED --- Index: progect.h =================================================================== RCS file: /cvsroot/progect/progect/progect.h,v retrieving revision 1.60.4.5 retrieving revision 1.60.4.6 diff -C2 -d -r1.60.4.5 -r1.60.4.6 *** progect.h 25 Mar 2004 23:07:40 -0000 1.60.4.5 --- progect.h 13 Jun 2004 13:33:34 -0000 1.60.4.6 *************** *** 18,22 **** #define CREATOR 'obPG' #define gPrepend "obPG-" ! #define VERSION "0.30b1" #define DBVERSION 23 #define EXTENSION ".pgt" --- 18,22 ---- #define CREATOR 'obPG' #define gPrepend "obPG-" ! #define VERSION "0.OBb1" #define DBVERSION 23 #define EXTENSION ".pgt" --- cs.rcp DELETED --- --- NEW FILE: progect-cs.rcp --- // Czech Translation by Michal Krause <mi...@kr...> // put the abbreviation of the language TRANSLATION "CS" BEGIN "OK" = "OK" "Cancel" = "Zruäit" "Done" = "Hotovo" "Edit" = "Upravit" "Preferences" = "Moìnosti" "Up" = "Vùä" "Flat Filter Details" = "Detaily plochho filtru" "Hide done tasks : " = "Skrùt hotov: " "Only" = "Pouze" "No" = "Ne" "AND" = "a" "OR" = "nebo" "Dated Tasks : " = "òkoly s dat.: " "Yes" = "Ano" "No" = "Ne" "All" = "Väe" "Sort : " = "TÞdit" "Date" = "Datum" "Priority" = "Prior." "Overdue" = "Proäl" "Publish to LinkMaster" = "Publikovat v LinkMasteru" "Link via LinkMaster" = "Odkazovat pÞes LinkMaster" "Remove Link" = "Zruäit odkaz" "Display Prefs." = "Volby zobrazen" "Flat Filter" = "Plochù filtr" "DB" = "DB" "Close" = "ZavÞt" "Delete All" = "Smazat väe" "Repair Tree" = "Opravit strom" "Sync With ToDo" = "Synchro s ToDo " "Export To MemoPad" = "Exportovat do MemoPadu" "Cut" = "VyÞznout" "Copy" = "Koprovat" "Copy Children" = "Koprovat potomky" "Paste" = "Vloìit" "Paste As Child" = "Vloìit jako potomka" "New Link" = "Novù odkaz" "Tree" = "Strom" "Delete Task" = "Smazat kol" "Delete Children" = "Smazat potomky" "Delete All Done Tasks" = "Smazat hotov koly" "Expand all" = "Rozvinout väe" "Collapse all" = "Svinout väe" "Expand one" = "Rozvinout vtev" "Collapse one" = "Svinout vtev" "View All" = "Zobrazit väe" "Options" = "Volby" "Task Defaults" = "Vùchoz volby kolu" "Help" = "?" "About" = "O programu" "Task Properties" = "Vlastnosti kolu" "Task Description" = "Popis kolu" "Action : " = "Akce: " "icon" = "ikonka" "Priority : " = "Priorita: " "Due Date : " = "Termn: " "Today" = "Dnes" "Tomorrow" = "Ztra" "In one week" = "Za tùden" "No date" = "Bez data" "Choose date" = "Zvolte datum" "ToDo Link : " = "ToDo odkaz" "Note" = "Poznmka" "Delete" = "Smazat" "Undo" = "Zpt" "Select All" = "Vybrat väe" "Keyboard" = "Klvesnice" "Graffiti Help" = "Graffiti npovda" "Palm Progect" = "Palm Progect" "Open" = "otevÞi" "New" = "novù" "Del" = "smaì" "Rename" = "jmno" "Projects" = "Projekty" "Duplicate Project" = "Duplikovat projekt" "Link Type : " = "Typ odkazu: " "Memo" = "Memo" "Address" = "Adresa" "Appointement" = "Schózka" "Link To : " = "Odkaz na: " "Choose a project name" = "Zvolte jmno projektu" "Name : " = "Jmno: " "Confirmation" = "Potvrzen" "Are your sure you want to delete ^1 ? (This cannot be undone)" = "Opravdu chcete smazat ^1? (Zmna je nevratn)" "A database named ^1 already exists." = "Databze jmnem ^1 jiì existuje." "Project Properties" = "Vlastnosti projektu" "Display due dates : " = "Zobrazovat termny: " "Display priorities : " = "Vlastnosti zobrazen: " "Backup project : " = "Zlohovat projekt: " "Delete always warn : " = "Varovat pÞi mazn: " "Print year : " = "Zobrazovat rok: " "Use Father Status : " = "Pouìt stav rodie: " "Auto Sync ToDo : " = "Auto-synchro s ToDo: " "Export to MemoPad Properties" = "Vlastnosti exportu" "Export done tasks : " = "Exportovat hotov" "Export due dates : " = "Exportovat termny" "Export priorities : " = "Exportovat priority" "Export progress : " = "Exportovat ukazatele" "Export Note: " = "Exportovat poznmky" "Export Flat View: " = "Exportovat plochù pohl." "Display Properties" = "Vlastnosti zobrazen" "Priority to bold : " = "Priorita tun: " "Days to bold : " = "Dny tun: " "ALL" = "VáE" "2 days" = "2 dny" "3 days" = "3 dny" "4 days" = "4 dny" "5 days" = "5 dn" "6 days" = "6 dn" "1 week" = "1 tùden" "2 weeks" = "2 tùdny" "3 weeks" = "3 tùdny" "4 weeks" = "4 tùdny" "None" = "Nic" "Strike done task : " = "ákrtnout hotov: " "Hide done progress : " = "Skrùt hotov ukaz.: " "Hide all progress : " = "Skrùt väechny ukaz.: " "Range of command" = "Rozsah povelu" "The Whole Tree" = "Celù strom" "Actual Subview" = "Aktuln pohled" "Select icon" = "Vùbr ikonky" "Remove" = "Odstranit" "\"Actual subtree\" applies the command to the actual view, not the children of the selected task !!!" = "\"Aktuln podstrom\" aplikuje povel na aktuln pohled, nikoliv na potomky vybranho kolu!!!" "this note" = "tato poznmka" "all tasks" = "väechny koly" "all tasks in this subview" = "väechny koly v pohledu" "all children of this selected task" = "väichni potomci vybranho kolu" "this task an all its children" = "tento kol a väichni jeho potomci" "all done tasks" = "väechny hotov koly" "all done tasks in this view" = "väechny hotov koly v tomto pohledu" "You must first select a task to do this." = "PÞed touto akc muste vybrat kol." "LinkMaster is not available." = "LinkMaster nen dostupnù." "LinkInfo not found." = "Informace o odkazu nenalezeny." "no memory spaces" = "nedostatek voln pamti" "DOC already exists. Please delete it before export." = "DOC jiì "\ "existuje, pÞed exportem jej muste zruäit" END #include "progectRsc.h" #include "btm.h" BITMAPFAMILY BtmItemAlone "bitmaps/alone_item_11x11x1.bmp" "" "" "bitmaps/alone_item_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmItemAloneNoLine "bitmaps/alone_item_noline_11x11x1.bmp" "" "" "bitmaps/alone_item_noline_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmItemFirst "bitmaps/first_item_11x11x1.bmp" "" "" "bitmaps/first_item_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmItemMiddle "bitmaps/vert_item_11x11x1.bmp" "" "" "bitmaps/vert_item_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmItemBottom "bitmaps/item_last_11x11x1.bmp" "" "" "bitmaps/item_last_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmItemChild "bitmaps/has_child_11x11x1.bmp" "" "" "bitmaps/has_child_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmItemChildWrapped "bitmaps/vert_child_11x11x1.bmp" "" "" "bitmaps/vert_child_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmItemChildNextWrapped "bitmaps/vert_child_next_11x11x1.bmp" "" "" "bitmaps/vert_child_next_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmItemNo "bitmaps/vert_alone_11x11x1.bmp" "" "" "bitmaps/vert_alone_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmItemChildNo "bitmaps/has_child_no_11x11x1.bmp" "" "" "bitmaps/has_child_no_11x11x8.bmp" BITMAPFAMILY BtmMinusAlone "bitmaps/minus_alone_11x11x1.bmp" "" "" "bitmaps/minus_alone_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmPlusAlone "bitmaps/plus_alone_11x11x1.bmp" "" "" "bitmaps/plus_alone_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmIconIndent "bitmaps/indent_icon_11x12x1.bmp" "" "" "bitmaps/indent_icon_11x12x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmIconFlat "bitmaps/flat_icon_11x12x1.bmp" "" "" "bitmaps/flat_icon_11x12x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmIconIndentBig "bitmaps/indent_icon_big_17x18x1.bmp" "" "" "bitmaps/indent_icon_big_17x18x8.bmp" BITMAPFAMILY BtmIconFlatBig "bitmaps/flat_icon_big_17x18x1.bmp" "" "" "bitmaps/flat_icon_big_17x18x8.bmp" BITMAPFAMILY BtmLinkOn "bitmaps/link_on_8x8x1.bmp" "" "" "bitmaps/link_on_8x8x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmLinkOff "bitmaps/link_off_8x8x1.bmp" "" "" "bitmaps/link_off_8x8x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmLinkMaster "bitmaps/link_LinkMaster_8x8x1.bmp" "" "" "bitmaps/link_LinkMaster_8x8x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmCheckedBox "bitmaps/checked_box_11x11x1.bmp" "" "" "bitmaps/checked_box_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 FORM FrmMain 0 0 160 160 NOFRAME NOSAVEBEHIND MENUID FrmMainMainMenu BEGIN TITLE "12345678901234567890123456789012" FORMBITMAP at (136 1) BITMAP BtmIconIndent FORMBITMAP at (148 1) BITMAP BtmIconFlat PUSHBUTTON "" Btn_Main_Hierarchical at (136 1 11 12) GROUP 1 PUSHBUTTON "" Btn_Main_Flat at (PREVRIGHT+1 PREVTOP 11 12) GROUP 1 TABLE ProjectTable at (0 15 160 121) ROWS 25 COLUMNS 1 COLUMNWIDTHS 160 BUTTON "Done" Btn_Done at (1 147 auto 12) BUTTON "\003" Btn_Left at (PREVRIGHT+3 PREVTOP 12 12) NOFRAME FONT 3 BUTTON "\006" Btn_Down at (PREVRIGHT PREVTOP 12 12) NOFRAME FONT 3 BUTTON "\005" Btn_Up at (PREVLEFT PREVTOP-10 12 12) NOFRAME FONT 3 BUTTON "\004" Btn_Right at (PREVRIGHT PREVTOP+10 12 12) NOFRAME FONT 3 BUTTON "Sub" Btn_Sub at (PREVRIGHT+3 PREVTOP auto auto) BUTTON "Up" Btn_Sub_Up at (PREVRIGHT+3 PREVTOP auto auto) NONUSABLE REPEATBUTTON "\001" Btn_Scroll_Up at (145 143 13 auto) NOFRAME FONT 5 REPEATBUTTON "\002" Btn_Scroll_Down at (PREVLEFT PREVBOTTOM 13 auto) NOFRAME FONT 5 LIST "0%" "10%" "20%" "30%" "40%" "50%" "60%" "70%" "80%" "90%" "100%" Lst_Percent at (0 0 30 121) NONUSABLE LIST "1" "2" "3" "4" "5" "-" Lst_Priority at (0 0 auto 66) NONUSABLE END FORM FrmFlatFilter 2 2 156 156 MODAL BEGIN TITLE "Flat Filter Details" CHECKBOX "" Chk_Flat_Hide at (RIGHT@158 17 auto auto) LABEL "Hide done tasks:" AUTOID at (RIGHT@PREVLEFT-1 PREVTOP) PUSHBUTTON "Only" Btn_Only at (RIGHT@150 PREVBOTTOM+3 auto auto) GROUP 4 PUSHBUTTON "Min" Btn_Min at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 4 PUSHBUTTON "No" Btn_Priority_No at (RIGHT@150 PREVBOTTOM+3 auto auto) GROUP 1 PUSHBUTTON "1" Btn_Priority_1 at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 1 PUSHBUTTON "2" Btn_Priority_2 at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 1 PUSHBUTTON "3" Btn_Priority_3 at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 1 PUSHBUTTON "4" Btn_Priority_4 at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 1 PUSHBUTTON "5" Btn_Priority_5 at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 1 LABEL "Priority:" AUTOID at (RIGHT@PREVLEFT-1 PREVTOP) PUSHBUTTON "OR" Btn_Or at (RIGHT@150 PREVBOTTOM+3 auto auto) GROUP 2 PUSHBUTTON "AND" Btn_And at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 2 PUSHBUTTON "All" Btn_Not_Used at (RIGHT@150 PREVBOTTOM+3 auto auto) GROUP 3 PUSHBUTTON "No" Btn_Date at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 3 PUSHBUTTON "Yes" Btn_No_Date at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 3 LABEL "Dated Tasks:" AUTOID at (RIGHT@PREVLEFT-1 PREVTOP) POPUPTRIGGER "123456789" Pop_DaysToBold at (RIGHT@150 PREVBOTTOM+3 auto auto) LEFTANCHOR LABEL "Date in limit:" AUTOID at (RIGHT@PREVLEFT-1 PREVTOP) PUSHBUTTON "Priority" Btn_Priority_Sort at (RIGHT@150 PREVBOTTOM+3 auto auto) GROUP 5 PUSHBUTTON "Date" Btn_Date_Sort at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 5 PUSHBUTTON "No" Btn_No_Sort at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 5 LABEL "Sort:" AUTOID at (RIGHT@PREVLEFT-1 PREVTOP) LIST "None" "Overdue" "Today" "2 days" "3 days" "4 days" "5 days" "6 days" "1 week" "2 weeks" "3 weeks" "4 weeks" List_DaysToBold at (RIGHT@150 PREVTOP 65 121) NONUSABLE BUTTON "OK" Btn_Prop_Ok at (6 140 auto auto) BUTTON "Cancel" Btn_Prop_Cancel at (PREVRIGHT+3 PREVTOP auto auto) BUTTON "Categories..." Btn_Categories at (PREVRIGHT+3 PREVTOP auto auto) END FORM FrmFlat 0 0 160 160 NOFRAME NOSAVEBEHIND MENUID MenuFlat BEGIN TITLE "12345678901234567890123456789012" FORMBITMAP at (136 1) BITMAP BtmIconIndent FORMBITMAP at (148 1) BITMAP BtmIconFlat PUSHBUTTON "" Btn_Main_Hierarchical at (136 1 11 12) GROUP 1 PUSHBUTTON "" Btn_Main_Flat at (PREVRIGHT+1 PREVTOP 11 12) GROUP 1 TABLE ProjectTable at (0 15 160 121) ROWS 11 COLUMNS 1 COLUMNWIDTHS 160 BUTTON "Done" Btn_Done at (1 147 auto 12) REPEATBUTTON "\001" Btn_Scroll_Up at (145 143 13 auto) NOFRAME FONT 5 REPEATBUTTON "\002" Btn_Scroll_Down at (PREVLEFT PREVBOTTOM 13 auto) NOFRAME FONT 5 LIST "0%" "10%" "20%" "30%" "40%" "50%" "60%" "70%" "80%" "90%" "100%" Lst_Percent at (0 0 30 121) NONUSABLE LIST "1" "2" "3" "4" "5" "-" Lst_Priority at (0 0 auto 66) NONUSABLE END MENU MenuFlat BEGIN PULLDOWN "Edit" BEGIN MENUITEM "Publish to LinkMaster" MenuPublishLinkMaster MENUITEM "Link via LinkMaster" MenuLinkViaLinkMaster MENUITEM "Remove Link" MenuRemoveLinkViaLinkMaster MENUITEM "Add Note" MenuEditAddNote "a" MENUITEM "ToDo Link All" MenuLinkAll MENUITEM "ToDo Unlink All" MenuUnlinkAll END PULLDOWN "Options" BEGIN MENUITEM "Project Props." MenuMainPreferences "r" MENUITEM "Display Prefs." MenuMainDisplayPreferences "y" MENUITEM "Flat Filter" MenuMainFlatFilter "f" END END MENU FrmMainMainMenu BEGIN PULLDOWN "Project" BEGIN MENUITEM "Close" MenuMainClose "q" MENUITEM "Export" MenuMainMemoExport MENUITEM SEPARATOR MENUITEM "Delete Done Tasks" MenuMainDeleteDoneTask MENUITEM "Sync With ToDo" MenuMainSyncToDo MENUITEM "Set/Reset Attributes" MenuMainResetDates MENUITEM "Task Defaults" MenuMainTaskDefaults "s" MENUITEM SEPARATOR MENUITEM "About Progect" MenuProjectListAbout END PULLDOWN "Edit" BEGIN MENUITEM "New (Sub)Task" MenuMainNewTask "n" MENUITEM "Cut" MenuEditCut "x" MENUITEM "Copy" MenuEditCopy "c" MENUITEM "Copy Children" MenuEditCopyChildren "i" MENUITEM "Paste" MenuEditPaste "p" MENUITEM "Paste As Child" MenuEditPasteAsChildren "h" MENUITEM "Add Note" MenuEditAddNote "a" MENUITEM "Delete Task" MenuMainDeleteTask "d" MENUITEM SEPARATOR MENUITEM "Publish to LinkMaster" MenuPublishLinkMaster MENUITEM "Link via LinkMaster" MenuLinkViaLinkMaster MENUITEM "Remove Link" MenuRemoveLinkViaLinkMaster END PULLDOWN "Tree" BEGIN MENUITEM "Delete Children" MenuMainDeleteChildren MENUITEM SEPARATOR MENUITEM "Expand all" MenuMainExpandAll "e" MENUITEM "Collapse all" MenuMainCollapseAll "o" MENUITEM "Collapse father" MenuMainCollapseFather "!" MENUITEM SEPARATOR MENUITEM "Go to top" MenuMainTop "t" MENUITEM "Go to bottom" MenuMainBottom "b" MENUITEM SEPARATOR MENUITEM "Repair Tree" MenuMainRepair END PULLDOWN "View" BEGIN MENUITEM "Clear Subtask View" MenuMainViewAll "v" MENUITEM "Delete Tasks in View" MenuMainReInit MENUITEM SEPARATOR MENUITEM "Project Props." MenuMainPreferences "r" MENUITEM "Display Prefs." MenuMainDisplayPreferences "y" MENUITEM "Flat Filter" MenuMainFlatFilter "f" END END FORM FrmTaskEdit 2 2 156 156 MODAL MENUID MenuNoteEdit BEGIN TITLE "Task Properties" LABEL "Task Description" AUTOID at (6 17) FONT 1 FIELD TaskDesc at (PREVLEFT PREVBOTTOM 146 22) UNDERLINED MULTIPLELINES MAXCHARS 255 AUTOSHIFT LABEL "Value:" LabelValue at (RIGHT@60 PREVBOTTOM+3) NONUSABLE FONT 1 FIELD TaskNumericActual at (PREVRIGHT+1 PREVTOP 30 11) NONUSABLE UNDERLINED MAXCHARS 5 NUMERIC LABEL "/" LabelSlash at (PREVRIGHT PREVTOP) NONUSABLE FONT 1 FIELD TaskNumericLimit at (PREVRIGHT PREVTOP 30 11) NONUSABLE UNDERLINED MAXCHARS 5 NUMERIC LABEL "Type:" AUTOID at (RIGHT@60 PREVBOTTOM+3) FONT 1 POPUPTRIGGER "123456789012345" Pop_Item_Type at (PREVRIGHT+1 PREVTOP auto auto) LEFTANCHOR LIST "Progress" "Numeric" "Action" "Info" Lst_Item_Type at (PREVLEFT PREVTOP 60 44) NONUSABLE BUTTON "icon" Btn_SelectIcon at (PREVRIGHT+2 PREVTOP auto auto) LABEL "Priority:" AUTOID at (RIGHT@60 PREVBOTTOM+3) FONT 1 PUSHBUTTON "1" Btn_Priority_1 at (PREVRIGHT+1 PREVTOP auto auto) GROUP 1 PUSHBUTTON "2" Btn_Priority_2 at (PREVRIGHT+1 PREVTOP auto auto) GROUP 1 PUSHBUTTON "3" Btn_Priority_3 at (PREVRIGHT+1 PREVTOP auto auto) GROUP 1 PUSHBUTTON "4" Btn_Priority_4 at (PREVRIGHT+1 PREVTOP auto auto) GROUP 1 PUSHBUTTON "5" Btn_Priority_5 at (PREVRIGHT+1 PREVTOP auto auto) GROUP 1 PUSHBUTTON "No" Btn_Priority_No at (PREVRIGHT+1 PREVTOP auto auto) GROUP 1 LABEL "Due Date:" AUTOID at (RIGHT@60 PREVBOTTOM+3) FONT 1 POPUPTRIGGER "1234567890123456789012345" Pop_Due_Date at (PREVRIGHT+1 PREVTOP auto auto) LEFTANCHOR LIST "Today" "Tomorrow" "In one week" "No date" "Choose date" Lst_Date at (PREVLEFT PREVTOP 60 55) NONUSABLE LABEL "ToDo Link:" AUTOID at (RIGHT@60 PREVTOP+12) FONT 1 CHECKBOX "" Chk_Edit_ToDo_Link at (PREVRIGHT+1 PREVTOP auto auto) BUTTON "+7" Btn_Plus_Seven at (138 PREVTOP+2 16 auto) BUTTON "\002" Btn_Minus_One at (PREVLEFT PREVBOTTOM+2 8 auto) NOFRAME FONT 4 BUTTON "\003" Btn_Plus_One at (PREVRIGHT PREVTOP 8 auto) NOFRAME FONT 4 LABEL "Category:" AUTOID at (RIGHT@60 PREVTOP-2) FONT 1 POPUPTRIGGER "123456789012345" Pop_Category at (PREVRIGHT+1 PREVTOP auto auto) LEFTANCHOR LIST "" Lst_Category at (PREVLEFT PREVTOP 90 40) NONUSABLE BUTTON "OK" Btn_Edit_Ok at (6 140 auto auto) BUTTON "Cancel" Btn_Edit_Cancel at (PREVRIGHT+10 PREVTOP auto auto) BUTTON "Note" Btn_Edit_Note at (PREVRIGHT+10 PREVTOP auto auto) GRAFFITISTATEINDICATOR at (140 140) END //CHECKBOX "" Chk_Edit_ToDo_Parent at (PREVRIGHT-2 PREVTOP auto auto) //LABEL "Parents" AUTOID at (PREVRIGHT-2 PREVTOP) FONT 1 FORM FrmNoteEdit 0 0 160 160 MODAL MENUID MenuNoteEdit BEGIN TITLE "12345678901234567890123456789012" FIELD TaskNote at (0 12 153 127) UNDERLINED MULTIPLELINES DYNAMICSIZE MAXCHARS 4000 AUTOSHIFT HASSCROLLBAR BUTTON "OK" Btn_Note_Ok at (2 147 auto auto) BUTTON "Cancel" Btn_Note_Cancel at (PREVRIGHT+3 PREVTOP auto auto) BUTTON "Delete" Btn_Note_Delete at (PREVRIGHT+3 PREVTOP auto auto) BUTTON "Date" Btn_Date at (PREVRIGHT+3 PREVTOP auto auto) GRAFFITISTATEINDICATOR at (147 147) SCROLLBAR Scr_Note_Edit at (153 15 7 120) USABLE END MENU ID MenuNoteEdit BEGIN PULLDOWN "Edit" BEGIN MENUITEM "Undo" MenuEditUndo "u" MENUITEM "Cut" MenuEditCut "x" MENUITEM "Copy" MenuEditCopy "c" MENUITEM "Paste" MenuEditPaste "p" MENUITEM "Select All" MenuEditSelectAll "s" MENUITEM SEPARATOR MENUITEM "Keyboard" MenuEditKeyboard "k" MENUITEM "Graffiti Help" MenuEditGraffiti "g" END END FORM FrmProjectList 0 0 160 160 NOFRAME MENUID MenuProjectList NOSAVEBEHIND BEGIN TITLE "Progect" BUTTON "Open" Btn_List_Open at (3 147 auto auto) BUTTON "New" Btn_List_New at (PREVRIGHT+3 PREVTOP auto auto) BUTTON "Rename" Btn_List_Rename at (PREVRIGHT+3 PREVTOP auto auto) POPUPTRIGGER "" ID ProjectCategoryPopup AT (RIGHT@160 0 70 AUTO) RIGHTANCHOR LIST "All" "Unfiled" ID ProjectCategoryList AT (PrevLeft PrevTop 70 1) VISIBLEITEMS 2 NONUSABLE POPUPLIST ID ProjectCategoryPopup ProjectCategoryList TABLE ID ProjectListTable AT ( 0 15 160 130) ROWS 11 COLUMNS 1 COLUMNWIDTHS 160 REPEATBUTTON "\001" Btn_Scroll_Up at (148 145 13 auto) NOFRAME FONT 5 REPEATBUTTON "\002" Btn_Scroll_Down at (PREVLEFT PREVBOTTOM-1 13 auto) NOFRAME FONT 5 END CATEGORIES ID ProjectDefaultCategoryList "Unfiled" "Business" "Personal" MENU MenuProjectList BEGIN PULLDOWN "Projects" BEGIN MENUITEM "Open Project" MenuProjectListOpen "o" MENUITEM "New Project" MenuProjectListNew "n" MENUITEM "Beam Project" MenuProjectListBeam "b" MENUITEM "Project Props." MenuMainPreferences "r" MENUITEM SEPARATOR MENUITEM "Rename Project" MenuProjectListRename MENUITEM "Duplicate Project" MenuProjectListDuplicate MENUITEM "Update Project List" MenuProjectListUpdateList MENUITEM SEPARATOR MENUITEM "Delete Project" MenuProjectListDelete "d" END PULLDOWN "Help" BEGIN MENUITEM "About" MenuProjectListAbout "a" END END ALERT ProgectAbout INFORMATION BEGIN TITLE "About Progect" MESSAGE "Progect ^1 (c) 2003 (GPL)\nL Burgbacher, R Price\n" \ "Homepage http://progect.sf.net\n" \ "Maintainer ric...@us...\n" \ "Mailing List http://groups.yahoo.com/group/progect" BUTTONS "OK" END FORM FrmChooseName 2 80 156 78 MODAL BEGIN TITLE "Choose a project name" LABEL "Name:" AUTOID at (6 17) FONT 1 FIELD Fld_Project_Name at (PREVRIGHT+1 PREVTOP 100 auto) UNDERLINED MAXCHARS 26 AUTOSHIFT BUTTON "OK" Btn_Choose_Name_Ok at (6 60 auto auto) BUTTON "Cancel" Btn_Choose_Name_Cancel at (PREVRIGHT+3 PREVTOP auto auto) GRAFFITISTATEINDICATOR at (140 60) END ALERT AltConfirmDelete DEFAULTBUTTON 1 CONFIRMATION BEGIN TITLE "Confirmation" MESSAGE "Are your sure you want to delete ^1 ? (This cannot be undone)" BUTTONS "OK" "Cancel" END ALERT AltConfirmCustom DEFAULTBUTTON 1 CONFIRMATION BEGIN TITLE "Confirmation" MESSAGE "Are you sure you want to ^1 ^2 ? (This cannot be undone)" BUTTONS "OK" "Cancel" END ALERT AltEmpty INFORMATION BEGIN TITLE "" MESSAGE "^1 ^2 ^3" BUTTONS "OK" END ALERT AltAlreadyExists ERROR BEGIN TITLE "Error" MESSAGE "A database named ^1 already exists." BUTTONS "OK" END FORM FrmProjectProperties 2 2 156 156 MODAL BEGIN TITLE "Project Properties" LABEL "Project Category:" AUTOID at (RIGHT@100 17) POPUPTRIGGER "" ID ProjectPreferencesCategoryPopup AT (RIGHT@152 PREVTOP AUTO AUTO) RIGHTANCHOR LABEL "Hide done tasks:" AUTOID at (RIGHT@135 PREVBOTTOM) CHECKBOX "" Chk_Prop_Hide at (PREVRIGHT+1 PREVTOP auto auto) LABEL "Display due dates:" AUTOID at (RIGHT@PREVLEFT PREVBOTTOM) CHECKBOX "" Chk_Prop_Display_Due_Dates at (PREVRIGHT PREVTOP auto auto) LABEL "Display priorities:" AUTOID at (RIGHT@PREVLEFT PREVBOTTOM) CHECKBOX "" Chk_Prop_Display_Priorities at (PREVRIGHT PREVTOP auto auto) LABEL "Backup project:" AUTOID at (RIGHT@PREVLEFT PREVBOTTOM) CHECKBOX "" Chk_Prop_Save_DB at (PREVRIGHT PREVTOP auto auto) LABEL "Delete always warn:" AUTOID at (RIGHT@PREVLEFT PREVBOTTOM) CHECKBOX "" Chk_Prop_Delete_Warn at (PREVRIGHT PREVTOP auto auto) LABEL "Print year:" AUTOID at (RIGHT@PREVLEFT PREVBOTTOM) CHECKBOX "" Chk_Prop_Display_Year at (PREVRIGHT PREVTOP auto auto) LABEL "Use Father Status:" AUTOID at (RIGHT@PREVLEFT PREVBOTTOM) CHECKBOX "" Chk_Prop_Father_Status at (PREVRIGHT PREVTOP auto auto) LABEL "Auto Sync ToDo:" AUTOID at (RIGHT@PREVLEFT PREVBOTTOM) CHECKBOX "" Chk_Prop_Auto_Sync_ToDo at (PREVRIGHT PREVTOP auto auto) LABEL "Record Completion Date:" AUTOID at (RIGHT@PREVLEFT PREVBOTTOM) CHECKBOX "" Chk_Prop_Comp_Date at (PREVRIGHT PREVTOP auto auto) LIST "All" "Unfiled" ID ProjectPreferencesCategoryList AT (RIGHT@152 17 70 1) VISIBLEITEMS 1 NONUSABLE POPUPLIST ID ProjectPreferencesCategoryPopup ProjectPreferencesCategoryList BUTTON "OK" Btn_Prop_Ok at (6 140 auto auto) BUTTON "Cancel" Btn_Prop_Cancel at (PREVRIGHT+3 PREVTOP auto auto) END FORM FrmMemoExportProperties 2 2 156 156 MODAL BEGIN TITLE "Export to MemoPad/Doc" LABEL "Please select export options:" AUTOID at (2 17) LABEL "Done tasks:" AUTOID at (RIGHT@135 PREVBOTTOM) CHECKBOX "" Chk_Exp_Done at (PREVRIGHT PREVTOP auto auto) LABEL "Due dates:" AUTOID at (RIGHT@PREVLEFT PREVBOTTOM) CHECKBOX "" Chk_Exp_Due_Dates at (PREVRIGHT PREVTOP auto auto) LABEL "Priorities:" AUTOID at (RIGHT@PREVLEFT PREVBOTTOM) CHECKBOX "" Chk_Exp_Priorities at (PREVRIGHT PREVTOP auto auto) LABEL "Progress:" AUTOID at (RIGHT@PREVLEFT PREVBOTTOM) CHECKBOX "" Chk_Exp_Progress at (PREVRIGHT PREVTOP auto auto) LABEL "Flat View:" AUTOID at (RIGHT@PREVLEFT PREVBOTTOM) CHECKBOX "" Chk_Exp_Flat at (PREVRIGHT PREVTOP auto auto) LABEL "DOC format only:" AUTOID at (2 PREVBOTTOM) LABEL "Note:" AUTOID at (RIGHT@135 PREVBOTTOM) CHECKBOX "" Chk_Exp_Note at (PREVRIGHT PREVTOP auto auto) LABEL "DOC Format:" AUTOID at (2 PREVBOTTOM) POPUPTRIGGER "1234567890123456" Pop_DocFormat at (PREVRIGHT+1 PREVTOP auto auto) LEFTANCHOR LIST "RAW TEXT" "HTML <UL>" "HTML <H1>" "HTML <TABLE>" Lst_DocFormat at (PREVLEFT PREVTOP 110 44) NONUSABLE BUTTON "Memo" Btn_ToMemo at (6 140 auto auto) BUTTON "DOC" Btn_ToDoc at (PREVRIGHT+3 PREVTOP auto auto) BUTTON "Cancel" Btn_Cancel at (PREVRIGHT+3 PREVTOP auto auto) END FORM FrmSetReset 2 2 156 156 MODAL BEGIN TITLE "Set/Reset" LABEL "Reset Dates:" AUTOID at (RIGHT@135 17) FONT 1 CHECKBOX "" Chk_Reset_Dates at (PREVRIGHT PREVTOP auto auto) LABEL "Reset Progress:" AUTOID at (RIGHT@PREVLEFT PREVBOTTOM) FONT 1 CHECKBOX "" Chk_Reset_Progress at (PREVRIGHT PREVTOP auto auto) LABEL "Reset Priority:" AUTOID at (RIGHT@PREVLEFT PREVBOTTOM) FONT 1 CHECKBOX "" Chk_Reset_Priority at (PREVRIGHT PREVTOP auto auto) LABEL "ToDo Unlink:" AUTOID at (RIGHT@PREVLEFT PREVBOTTOM) FONT 1 CHECKBOX "" Chk_ToDo_Unlink at (PREVRIGHT PREVTOP auto auto) LABEL "ToDo Link:" AUTOID at (RIGHT@PREVLEFT PREVBOTTOM) FONT 1 CHECKBOX "" Chk_ToDo_Link at (PREVRIGHT PREVTOP auto auto) BUTTON "OK" Btn_Ok at (6 140 auto auto) BUTTON "Cancel" Btn_Cancel at (PREVRIGHT+3 PREVTOP auto auto) END FORM FrmDisplayProperties 2 2 156 156 MODAL BEGIN TITLE "Display Properties" LABEL "Priority to bold:" AUTOID at (RIGHT@106 17) POPUPTRIGGER "123456789012345" Pop_PriorityToBold at (PREVRIGHT+1 PREVTOP auto auto) LEFTANCHOR LIST "None" "1" "2" "3" "4" "5" "ALL" List_PriorityToBold at (PREVLEFT PREVTOP 40 77) NONUSABLE LABEL "Days to bold:" AUTOID at (RIGHT@PREVLEFT PREVTOP + 14) POPUPTRIGGER "123456789012345" Pop_DaysToBold at (PREVRIGHT+1 PREVTOP auto auto) LEFTANCHOR LIST "None" "Overdue" "Today" "2 days" "3 days" "4 days" "5 days" "6 days" "1 week" "2 weeks" "3 weeks" "4 weeks" List_DaysToBold at (PREVLEFT PREVTOP 40 121) NONUSABLE LABEL "Max wrap lines:" AUTOID at (RIGHT@134 PREVTOP + 14) POPUPTRIGGER "123456789012345" Pop_WordWrapLines at (PREVRIGHT+1 PREVTOP auto auto) LEFTANCHOR LIST "1" "2" "3" "4" "5" "6" "7" "8" "9" List_WordWrapLines at (PREVLEFT PREVTOP auto 55) NONUSABLE CHECKBOX "" Chk_DispProp_StrikeDoneTasks at (RIGHT@160 PREVTOP+14 auto auto) LABEL "Strike done tasks:" AUTOID at (RIGHT@PREVLEFT PREVTOP) CHECKBOX "" Chk_DispProp_HideDoneProgress at (PREVRIGHT PREVBOTTOM auto auto) LABEL "Hide done progress:" AUTOID at (RIGHT@PREVLEFT PREVTOP) CHECKBOX "" Chk_DispProp_HideAllProgress at (PREVRIGHT PREVBOTTOM auto auto) LABEL "Hide all progress:" AUTOID at (RIGHT@PREVLEFT PREVTOP) CHECKBOX "" Chk_DispProp_DrawTreeLines at (PREVRIGHT PREVBOTTOM auto auto) LABEL "Draw Tree Lines:" AUTOID at (RIGHT@PREVLEFT PREVTOP) BUTTON "OK" Btn_Ok at (6 140 auto auto) BUTTON "Cancel" Btn_Cancel at (PREVRIGHT+10 PREVTOP auto auto) END FORM FrmTaskDefaults 2 80 156 78 MODAL BEGIN TITLE "Task Defaults" LABEL "Type:" AUTOID at (RIGHT@60 17) FONT 1 POPUPTRIGGER "123456789" Pop_Item_Type at (PREVRIGHT+1 PREVTOP auto auto) LEFTANCHOR LIST "Progress" "Numeric" "Action" "Info" Lst_Item_Type at (PREVLEFT PREVTOP 60 44) NONUSABLE LABEL "Priority:" AUTOID at (RIGHT@60 PREVTOP+14) FONT 1 PUSHBUTTON "1" Btn_Priority_1 at (PREVRIGHT+1 PREVTOP auto auto) GROUP 1 PUSHBUTTON "2" Btn_Priority_2 at (PREVRIGHT+1 PREVTOP auto auto) GROUP 1 PUSHBUTTON "3" Btn_Priority_3 at (PREVRIGHT+1 PREVTOP auto auto) GROUP 1 PUSHBUTTON "4" Btn_Priority_4 at (PREVRIGHT+1 PREVTOP auto auto) GROUP 1 PUSHBUTTON "5" Btn_Priority_5 at (PREVRIGHT+1 PREVTOP auto auto) GROUP 1 PUSHBUTTON "No" Btn_Priority_No at (PREVRIGHT+1 PREVTOP auto auto) GROUP 1 BUTTON "OK" Btn_Edit_Ok at (6 60 auto auto) BUTTON "Cancel" Btn_Edit_Cancel at (PREVRIGHT+3 PREVTOP auto auto) END FORM FrmSubOrAll 2 80 156 78 HELPID HlpSubOrAll MODAL BEGIN TITLE "Range of command" BUTTON "The Whole Tree" Btn_Sub_All at (center 20 auto auto) BUTTON "Actual Subview" Btn_Sub_Sub at (center PREVBOTTOM+5 auto auto) BUTTON "Cancel" Btn_Sub_Cancel at (center PREVBOTTOM+5 auto auto) END FORM FrmIconSelect 0 0 160 160 MODAL NOFRAME BEGIN TITLE "Select icon" TABLE IconSelectTable at (1 15 150 121) ROWS 11 COLUMNS 2 COLUMNWIDTHS 75 75 SCROLLBAR Scr_SelectIcon at (PREVRIGHT+1 PREVTOP 7 121) BUTTON "OK" Btn_Ok at (6 140 auto auto) BUTTON "Cancel" Btn_Cancel at (PREVRIGHT+3 PREVTOP auto auto) BUTTON "Remove" Btn_Remove at (PREVRIGHT+3 PREVTOP auto auto) END FORM FrmCategoriesSelect 0 0 160 160 MODAL NOFRAME BEGIN TITLE "Select Categories" TABLE CategoriesSelectTable at (1 15 150 121) ROWS 16 COLUMNS 2 COLUMNWIDTHS 12 137 SCROLLBAR Scr_SelectCategories at (PREVRIGHT+1 PREVTOP 7 121) BUTTON "OK" Btn_Ok at (6 140 auto auto) BUTTON "Cancel" Btn_Cancel at (PREVRIGHT+3 PREVTOP auto auto) BUTTON "All" Btn_All at (PREVRIGHT+3 PREVTOP auto auto) BUTTON "Toggle" Btn_Toggle at (PREVRIGHT+3 PREVTOP auto auto) END STRING HlpSubOrAll "\"Actual subtree\" applies the command to the actual view, not the children of the selected task !!!" STRING StrThisNote "this note" STRING StrAllTasks "all tasks" STRING StrAllTasksInThisSubview "all tasks in this subview" STRING StrAllChildrenOfSelectedTask "all children of this selected task" STRING StrTaskAndChildren "this task and all its children" STRING StrAllDoneTasks "all done tasks" STRING StrAllDoneTasksInThisView "all done tasks in this view" STRING StrSelectTask "You must first select a task to do this." STRING StrLinkMasterIsNotAvailable "LinkMaster is not available." STRING StrLinkInfoNotFound "LinkInfo not found." STRING StrNoMemorySpaces "Not enough memory for this operation" STRING StrIconButton "icon" STRING StrFindHeader "Progect" STRING StrDocAlreadyExist "DOC already exists. Please delete it before export." STRING StrPrefsHasBeenDeleted "Your project preferences have been deleted, please go to the preference menu and set them." STRING StrActionDelete "delete" STRING StrActionResetDates "reset the dates of" STRING StrActionModify "modify" STRING StrLinkNotValid "This link was not valid anymore, it has been deleted." STRING StrEditCategories "Edit categories..." STRING StrDBVersionIncorrect "The project you are trying to open needs version ^1 of progect. Please upgrade at sf.net/projects/progect" CATEGORIES ID InitialCategory "Unfiled" APPLICATIONICONNAME 1000 "OProgect" ICONFAMILYEX BEGIN BITMAP "bitmaps/progect_22x22x1.bmp" BPP 1 BITMAP "bitmaps/progect_22x22x8.bmp" BPP 8 DENSITY 1 END SMALLICONFAMILY "bitmaps/progectmini_15x9x1.bmp" "" "" "bitmaps/progectmini_15x9x8.bmp" ICON ID 2000 "bitmaps/progect_32x32x1.bmp" ICON ID 2001 "bitmaps/progect_22x14x1.bmp" HEX "sKst" ID 1000 0x00 0x00 0x00 0x00 VERSION "0.30b1" --- NEW FILE: progect-de.rcp --- TRANSLATION "DE" BEGIN "@#$CMT$#@"="-------------- Menue DB -------------------------------------" "Done" = "Okay" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "DB" = "DB" "Close" = "Schließen" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "Delete All" = "Alle löschen" "Repair Tree" = "Baum reparieren" "Sync With ToDo" = "Sync mit Todo" "Export" = "Exportieren" "@#$CMT$#@"="-------Menue DB Export --------------------------------" "@#$CMT$#@"=" descriptions non bold !" "Export to MemoPad/Doc" = "Export nach Memo/Doc" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "Export done tasks" = "erledigte Aufgaben" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "due dates" = "Fälligkeitsdatum" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "priorities" = "Prioritäten" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "Flat View" = "flache Ansicht" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "follows options are DOC only" = "nur für DOC-Format:" "@#$CMT$#@"="-------Menue DB Set/Reset -----------------------------" "@#$CMT$#@"=" descriptions non bold !" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "Dates" = "Termine" "Progress" = "Fortschritt" "Priority" = "Priorität" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "ToDo Unlink" = "ToDo Link aufheben" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "ToDo Link" = "ToDo Link herstellen" "@#$CMT$#@"=" Remark: The german Translation for ToDo is \"Aufgaben\"," "@#$CMT$#@"=" but ToDo is commonly used and shorter" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "Are you sure you want to modify ^1 ? (This cannot be undone)" = "Möchten Sie ^1 bearbeiten? (Rückgängig nicht möglich)" "@#$CMT$#@"="-------------- Menue Edit -------------------------------------" "Copy Children" = "Sub-Tasks kopieren" "Paste As Child" = "als Sub-Task einfügen" "New (Sub)Task" = "neuer (Sub)Task" "Add Note" = "Notiz anhängen" "Publish to LinkMaster" = "An LinkMaster schicken" "Link via LinkMaster" = "Link über LinkMaster" "Remove Link" = "Link entfernen" "@#$CMT$#@"="--------------- Menue Tree --------------------------------------" "Tree" = "Baum" "Delete Task" = "Task entfernen" "Delete Children" = "Sub-Tasks entfernen" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "Delete All Done Tasks" = "Erledigte Tasks löschen" "Expand all" = "Alle ausklappen" "Collapse all" = "Alle einklappen" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "Expand one" = "Zweig ausklappen" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "Collapse one" = "Zweig einklappen" "Collapse father" = "Ast einklappen" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "View All" = "Alle sichtbar" "Go to top" = "nach oben" "Go to bottom" = "nach unten" "@#$CMT$#@"="---------------- Menue Option -----------------------------------" "Options" = "Optionen" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "Preferences" = "Einstellungen" "@#$CMT$#@"="---------- Menue Option Project Properties -----------------------------" "Project Props." = "Projekteigenschaften" "Hide done tasks:" = "Fertige Tasks ausblenden" "Display due dates:" = "Fälligkeit anzeigen" "Display priorities:" = "Prioritäten anzeigen" "Backup project:" = "Projekt Backup erstellen" "Delete always warn:" = "Vor Löschen warnen" "Print year:" = "Auch Jahre anzeigen" "Use Father Status:" = "Vater-Status verwenden" "Auto Sync ToDo:" = "AutoSync mit ToDo" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "Record completion Date:" = "Fertigstellungsdatum aufzeichnen" "@#$CMT$#@"=" --------Menue Option Display Properties -------------------------" "Display Properties" = "Anzeigeeigenschaften" "@#$CMT$#@"=" where is \"Display Prefs.\"? added by Zei" "Display Prefs." = "Anzeigeeigenschaften" "Priority to bold:" = "Prioritäten fett markieren?" "Days to bold:" = "Tage fett markieren?" "Max wrap lines:" = "Wieviel Zeilen max. umbrechen?" "Strike done tasks:" = "Erledigte Aufgaben streichen?" "@#$CMT$#@"=" WAS CUT&PASTE HERE FROM UNTRANSLATED STRINGS" "Hide done progress:" = "Fortschritt für erledigte Tasks ausblenden?" "Hide all progress:" = "Fortschrittsanzeige ausblenden?" "Draw Tree Lines:" = "Baumlinien zeichnen?:" "None" = "Keine" "ALL" = "Alle" "Overdue" = "Überfällige" "2 days" = "2 Tage" "3 days" = "3 Tage" "4 days" = "4 Tage" "5 days" = "5 Tage" "6 days" = "6 Tage" "1 week" = "1 Woche" "2 weeks" = "2 Wochen" "3 weeks" = "3 Wochen" "4 weeks" = "4 Wochen" "@#$CMT$#@"=" -------- Menue Option Flat Filter --------------------------------" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Flat Filter Details" = "Filtereinstellungen" "Flat Filter" = "Filtereinstellungen" "Dated Tasks:" = "Aufgaben mit Termin:" "@#$CMT$#@"=" WAS CUT&PASTE HERE FROM UNTRANSLATED STRINGS" "Min" = "Mindestens" "@#$CMT$#@"=" WAS CUT&PASTE HERE FROM UNTRANSLATED STRINGS" "Only" = "Nur" "@#$CMT$#@"=" WAS CUT&PASTE HERE FROM UNTRANSLATED STRINGS" "AND" = "UND" "@#$CMT$#@"=" WAS CUT&PASTE HERE FROM UNTRANSLATED STRINGS" "OR" = "ODER" "@#$CMT$#@"=" WAS CUT&PASTE HERE FROM UNTRANSLATED STRINGS" "Yes" = "Ja" "@#$CMT$#@"=" WAS CUT&PASTE HERE FROM UNTRANSLATED STRINGS" "No" = "No" "@#$CMT$#@"=" WAS CUT&PASTE HERE FROM UNTRANSLATED STRINGS" "All" = "Alle" "Date in limit:" = "Termin in Bereich:" "Sort:" = "Sortieren:" "@#$CMT$#@"=" WAS CUT&PASTE HERE FROM UNTRANSLATED STRINGS" "Date" = "Datum" "@#$CMT$#@"=" WAS CUT&PASTE HERE FROM UNTRANSLATED STRINGS" "Categories..." = "Kategorien" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "Categories:" = "Kategorien:" "@#$CMT$#@"=" -------- Menue Option Task Defaults --------------------------------" "Task Defaults" = "ToDo Voreinstellungen" "@#$CMT$#@"=" misc Menue ---------------------------------------------------" "Edit" = "Bearb." "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "Undo" = "Rückgängig" "Cut" = "Ausschneiden" "Copy" = "Kopieren" "Paste" = "Einfügen" "Select All" = "Alle auswählen" "Keyboard" = "Tastatur" "Graffiti Help" = "Graffiti Hilfe" "@#$CMT$#@"=" -------------------------- Main -----------------------------------" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "Palm Progect" = "Palm Progect" "Open" = "Öffnen" "New" = "Neu" "Rename" = "Umbenennen" "Projects" = "Projekte" "Open Project" = "Projekt öffnen" "New Project" = "Neues Projekt" "Rename Project" = "Projekt umbenennen" "Duplicate Project" = "Projekte duplizieren" "Beam Project" = "Projekt übertragen" "Update Project List" = "Liste aktualisieren" "Delete Project" = "Projekt löschen" "Help" = "Hilfe" "About" = "Über Progect" "About Progect" = "Über Progect" "Choose a project name" = "Projektname wählen" "Name:" = "Name:" "Confirmation" = "Bestätigung" "Are your sure you want to delete ^1 ? (This cannot be undone)" = "Löschung von ^1 wirklich O.K.? (Rückgängig nicht möglich)" "Error" = "Fehler" "A database named ^1 already exists." = "Es existiert bereits eine Datenbank ^1" "Range of command" = "Befehlsreichweite" "The Whole Tree" = "Der ganze Baum" "Actual Subview" = "Derzeitige Unteransicht" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "\"Actual subtree\" applies the command to the actual " = "\"Actual subtree\" verwendet den Befehl nur für die derzeitige" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "view, not the children of the selected task !!!" = "Ansicht, nicht die Kinder der gewählten Aufgabe !" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "this note" = "diese Notiz" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "all tasks" = "alle Tasks" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "all tasks in this subview" = "alle Tasks in dieser Unteransicht" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "all children of this selected task" = "alle Kinder der gewählten Tasks" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "this task an all its children" = "diese Tasks und alle Kinder" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "all done tasks" = "alle fertigen Tasks" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "all done tasks in this view" = "alle fertigen Tasks dieses Jahres" "@#$CMT$#@"="---------------- Task Properties ---------------------------------" "Task Properties" = "Task Eigenschaften" "Task Description" = "Task Beschreibung" "@#$CMT$#@"=" +++ CHECK THIS +++ Translation not being used" "Action:" = "Aktion:" "@#$CMT$#@"=" please change descriptions to non bold ! " "@#$CMT$#@"=" Please adjust to right side of window!" "Priority:" = "Priorität:" "Due Date:" = "Fällig:" "@#$CMT$#@"="// position of \"+7\" is to far to the bottom" "Today" = "Heute" "Tomorrow" = "Morgen" "@#$CMT$#@"="List too narrow - Please widen this list!" "In one week" = "In einer Woche" "No date" = "Kein Datum" "Choose date" = "Datum wählen" "ToDo Link:" = "ToDo Link:" "Category:" = "Kategorie:" "OK" = "Okay" "Cancel" = "Abbrechen" "Note" = "Notiz" "@#$CMT$#@"=" These should be history soon !" "Sub" = "Tiefer" "Up" = "Höher" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "+7" = "+7" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "-" = "-" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "/" = "/" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "0%" = "0%" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "1" = "1" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "10%" = "10%" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "100%" = "100%" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "123456789" = "123456789" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "123456789012345" = "123456789012345" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "1234567890123456" = "1234567890123456" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "1234567890123456789012345" = "1234567890123456789012345" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "12345678901234567890123456789012" = "12345678901234567890123456789012" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "2" = "2" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "20%" = "20%" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "3" = "3" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "30%" = "30%" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "4" = "4" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "40%" = "40%" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "5" = "5" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "50%" = "50%" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "6" = "6" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "60%" = "60%" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "7" = "7" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "70%" = "70%" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "8" = "8" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "80%" = "80%" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "9" = "9" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "90%" = "90%" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Action" = "Aktion" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Are you sure you want to ^1 ^2 ? (This cannot be undone)" = "^1 ^2 - Sind Sie sicher? (Rückgängig nicht möglich)" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Business" = "Business" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Clear Subtask View" = "Clear Subtask View" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "DOC" = "DOC" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "DOC Format:" = "DOC Format:" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "DOC format only:" = "Nur DOC Format:" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Delete Done Tasks" = "Erledigte Tasks löschen" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Delete Tasks in View" = "Tasks dieser Ansicht löschen" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Done tasks:" = "Erledigte Tasks:" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Due dates:" = "Fällig:" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Flat View:" = "Filteransicht:" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "HTML <H1>" = "HTML <H1>" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "HTML <TABLE>" = "HTML <TABLE>" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "HTML <UL>" = "HTML <UL>" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Homepage http://progect.sf.net\n" = "Homepage http://progect.sf.net\n" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Info" = "Info" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Mailing List http://groups.yahoo.com/group/progect" = "Mailing List http://groups.yahoo.com/group/progect" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Maintainer ric...@us...\n" = "Maintainer ric...@us...\n" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Memo" = "Memo" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Note:" = "Notiz:" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Numeric" = "Numerisch" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Parents" = "Eltern" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Personal" = "Persönlich" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Please select export options:" = "Bitte Export-Optionen wählen:" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Priorities:" = "Prioritäten" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Progect" = "Progect" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Progect ^1 (c) 2003 (GPL)\nL Burgbacher, R Price\n" = "Progect ^1 (c) 2003 (GPL)\nL Burgbacher, R Price\n" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Progress:" = "Fortschritt:" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Project" = "Projekt" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Project Category:" = "Projektkategorie :" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Project Properties" = "Projekteigenschaften" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "RAW TEXT" = "Nur Text" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Record Completion Date:" = "Fertigstellungsdatum aufzeichnen :" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Remove" = "Entfernen" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Reset Dates:" = "Daten zürücksetzen:" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Reset Priority:" = "Priorität zurücksetzen :" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Reset Progress:" = "Fortschritt zurücksetzen:" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Select Categories" = "Kategorien auswählen" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Select icon" = "Icon auswählen" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Set/Reset" = "(Zurück)setzen" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Set/Reset Attributes" = "Attribute (zurück)setzen" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "ToDo Link All" = "Alle mit ToDo verlinken" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "ToDo Unlink:" = "ToDo Link entfernen :" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "ToDo Unlink All" = "Alle ToDo Links entfernen" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Toggle" = "Toggle" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Type:" = "Typ:" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Unfiled" = "nicht abgelegt" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "Value:" = "Wert:" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "View" = "Ansicht" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "\001" = "\001" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "\002" = "\002" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "\003" = "\003" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "\004" = "\004" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "\005" = "\005" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "\006" = "\006" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "^1 ^2 ^3" = "^1 ^2 ^3" "@#$CMT$#@"=" +++ CHECK THIS +++ Untranslated String" "icon" = "Icon" "Delete" = "Entfernen" END #include "progectRsc.h" #include "btm.h" BITMAPFAMILY BtmItemAlone "bitmaps/alone_item_11x11x1.bmp" "" "" "bitmaps/alone_item_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmItemAloneNoLine "bitmaps/alone_item_noline_11x11x1.bmp" "" "" "bitmaps/alone_item_noline_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmItemFirst "bitmaps/first_item_11x11x1.bmp" "" "" "bitmaps/first_item_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmItemMiddle "bitmaps/vert_item_11x11x1.bmp" "" "" "bitmaps/vert_item_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmItemBottom "bitmaps/item_last_11x11x1.bmp" "" "" "bitmaps/item_last_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmItemChild "bitmaps/has_child_11x11x1.bmp" "" "" "bitmaps/has_child_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmItemChildWrapped "bitmaps/vert_child_11x11x1.bmp" "" "" "bitmaps/vert_child_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmItemChildNextWrapped "bitmaps/vert_child_next_11x11x1.bmp" "" "" "bitmaps/vert_child_next_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmItemNo "bitmaps/vert_alone_11x11x1.bmp" "" "" "bitmaps/vert_alone_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmItemChildNo "bitmaps/has_child_no_11x11x1.bmp" "" "" "bitmaps/has_child_no_11x11x8.bmp" BITMAPFAMILY BtmMinusAlone "bitmaps/minus_alone_11x11x1.bmp" "" "" "bitmaps/minus_alone_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmPlusAlone "bitmaps/plus_alone_11x11x1.bmp" "" "" "bitmaps/plus_alone_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmIconIndent "bitmaps/indent_icon_11x12x1.bmp" "" "" "bitmaps/indent_icon_11x12x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmIconFlat "bitmaps/flat_icon_11x12x1.bmp" "" "" "bitmaps/flat_icon_11x12x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmIconIndentBig "bitmaps/indent_icon_big_17x18x1.bmp" "" "" "bitmaps/indent_icon_big_17x18x8.bmp" BITMAPFAMILY BtmIconFlatBig "bitmaps/flat_icon_big_17x18x1.bmp" "" "" "bitmaps/flat_icon_big_17x18x8.bmp" BITMAPFAMILY BtmLinkOn "bitmaps/link_on_8x8x1.bmp" "" "" "bitmaps/link_on_8x8x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmLinkOff "bitmaps/link_off_8x8x1.bmp" "" "" "bitmaps/link_off_8x8x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmLinkMaster "bitmaps/link_LinkMaster_8x8x1.bmp" "" "" "bitmaps/link_LinkMaster_8x8x8.bmp" COMPRESS TRANSPARENTINDEX 255 BITMAPFAMILY BtmCheckedBox "bitmaps/checked_box_11x11x1.bmp" "" "" "bitmaps/checked_box_11x11x8.bmp" COMPRESS TRANSPARENTINDEX 255 FORM FrmMain 0 0 160 160 NOFRAME NOSAVEBEHIND MENUID FrmMainMainMenu BEGIN TITLE "12345678901234567890123456789012" FORMBITMAP at (136 1) BITMAP BtmIconIndent FORMBITMAP at (148 1) BITMAP BtmIconFlat PUSHBUTTON "" Btn_Main_Hierarchical at (136 1 11 12) GROUP 1 PUSHBUTTON "" Btn_Main_Flat at (PREVRIGHT+1 PREVTOP 11 12) GROUP 1 TABLE ProjectTable at (0 15 160 121) ROWS 25 COLUMNS 1 COLUMNWIDTHS 160 BUTTON "Done" Btn_Done at (1 147 auto 12) BUTTON "\003" Btn_Left at (PREVRIGHT+3 PREVTOP 12 12) NOFRAME FONT 3 BUTTON "\006" Btn_Down at (PREVRIGHT PREVTOP 12 12) NOFRAME FONT 3 BUTTON "\005" Btn_Up at (PREVLEFT PREVTOP-10 12 12) NOFRAME FONT 3 BUTTON "\004" Btn_Right at (PREVRIGHT PREVTOP+10 12 12) NOFRAME FONT 3 BUTTON "Sub" Btn_Sub at (PREVRIGHT+3 PREVTOP auto auto) BUTTON "Up" Btn_Sub_Up at (PREVRIGHT+3 PREVTOP auto auto) NONUSABLE REPEATBUTTON "\001" Btn_Scroll_Up at (145 143 13 auto) NOFRAME FONT 5 REPEATBUTTON "\002" Btn_Scroll_Down at (PREVLEFT PREVBOTTOM 13 auto) NOFRAME FONT 5 LIST "0%" "10%" "20%" "30%" "40%" "50%" "60%" "70%" "80%" "90%" "100%" Lst_Percent at (0 0 30 121) NONUSABLE LIST "1" "2" "3" "4" "5" "-" Lst_Priority at (0 0 auto 66) NONUSABLE END FORM FrmFlatFilter 2 2 156 156 MODAL BEGIN TITLE "Flat Filter Details" CHECKBOX "" Chk_Flat_Hide at (RIGHT@158 17 auto auto) LABEL "Hide done tasks:" AUTOID at (RIGHT@PREVLEFT-1 PREVTOP) PUSHBUTTON "Only" Btn_Only at (RIGHT@150 PREVBOTTOM+3 auto auto) GROUP 4 PUSHBUTTON "Min" Btn_Min at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 4 PUSHBUTTON "No" Btn_Priority_No at (RIGHT@150 PREVBOTTOM+3 auto auto) GROUP 1 PUSHBUTTON "1" Btn_Priority_1 at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 1 PUSHBUTTON "2" Btn_Priority_2 at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 1 PUSHBUTTON "3" Btn_Priority_3 at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 1 PUSHBUTTON "4" Btn_Priority_4 at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 1 PUSHBUTTON "5" Btn_Priority_5 at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 1 LABEL "Priority:" AUTOID at (RIGHT@PREVLEFT-1 PREVTOP) PUSHBUTTON "OR" Btn_Or at (RIGHT@150 PREVBOTTOM+3 auto auto) GROUP 2 PUSHBUTTON "AND" Btn_And at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 2 PUSHBUTTON "All" Btn_Not_Used at (RIGHT@150 PREVBOTTOM+3 auto auto) GROUP 3 PUSHBUTTON "No" Btn_Date at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 3 PUSHBUTTON "Yes" Btn_No_Date at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 3 LABEL "Dated Tasks:" AUTOID at (RIGHT@PREVLEFT-1 PREVTOP) POPUPTRIGGER "123456789" Pop_DaysToBold at (RIGHT@150 PREVBOTTOM+3 auto auto) LEFTANCHOR LABEL "Date in limit:" AUTOID at (RIGHT@PREVLEFT-1 PREVTOP) PUSHBUTTON "Priority" Btn_Priority_Sort at (RIGHT@150 PREVBOTTOM+3 auto auto) GROUP 5 PUSHBUTTON "Date" Btn_Date_Sort at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 5 PUSHBUTTON "No" Btn_No_Sort at (RIGHT@PREVLEFT PREVTOP auto auto) GROUP 5 LABEL "Sort:" AUTOID at (RIGHT@PREVLEFT-1 PREVTOP) LIST "None" "Overdue" "Today" "2 days" "3 days" "4 days" "5 days" "6 days" "1 week" "2 weeks" "3 weeks" "4 weeks" List_DaysToBold at (RIGHT@150 PREVTOP 65 121) NONUSABLE BUTTON "OK" Btn_Prop_Ok at (6 140 auto auto) BUTTON "Cancel" Btn_Prop_Cancel at (PREVRIGHT+3 PREVTOP auto auto) BUTTON "Categories..." Btn_Categories at (PREVRIGHT+3 PREVTOP auto auto) END FORM FrmFlat 0 0 160 160 NOFRAME NOSAVEBEHIND MENUID MenuFlat BEGIN TITLE "12345678901234567890123456789012" FORMBITMAP at (136 1) BITMAP BtmIconIndent FORMBITMAP at (148 1) BITMAP BtmIconFlat PUSHBUTTON "" Btn_Main_Hierarchical at (136 1 11 12) GROUP 1 PUSHBUTTON "" Btn_Main_Flat at (PREVRIGHT+1 PREVTOP 11 12) GROUP 1 TABLE ProjectTable at (0 15 160 121) ROWS 11 COLUMNS 1 COLUMNWIDTHS 160 BUTTON "Done" Btn_Done at (1 147 auto 12) REPEATBUTTON "\001" Btn_Scroll_Up at (145 143 13 auto) NOFRAME FONT 5 REPEATBUTTON "\002" Btn_Scroll_Down at (PREVLEFT PREVBOTTOM 13 auto) NOFRAME FONT 5 LIST "0%" "10%" "20%" "30%" "40%" "50%" "60%" "70%" "80%" "90%" "100%" Lst_Percent at (0 0 30 121) NONUSABLE LIST "1" "2" "3" "4" "5" "-" Lst_Priority at (0 0 auto 66) NONUSABLE END MENU MenuFlat BEGIN PULLDOWN "Edit" BEGIN MENUITEM "Publish to LinkMaster" MenuPublishLinkMaster MENUITEM "Link via LinkMaster" MenuLinkViaLinkMaster MENUITEM "Remove Link" MenuRemoveLinkViaLinkMaster MENUITEM "Add Note" MenuEditAddNote "a" MENUITEM "ToDo Link All" MenuLinkAll MENUITEM "ToDo Unlink All" MenuUnlinkAll END PULLDOWN "Options" BEGIN MENUITEM "Project Props." MenuMainPreferences "r" MENUITEM "Display Prefs." MenuMainDisplayPreferences "y" MENUITEM "Flat Filter" MenuMainFlatFilter "f" END END MENU FrmMainMainMenu BEGIN PULLDOWN "Project" BEGIN MENUITEM "Close" MenuMainClose "q" MENUITEM "Export" MenuMainMemoExport MENUITEM SEPARATOR MENUITEM "Delete Done Tasks" MenuMainDeleteDoneTask MENUITEM "Sync With ToDo" MenuMainSyncToDo MENUITEM "Set/Reset Attributes" MenuMainResetDates MENUITEM "Task Defaults" MenuMainTaskDefaults "s" MENUITEM SEPARATOR MENUITEM "About Progect" MenuProjectListAbout END PULLDOWN "Edit" BEGIN MENUITEM "New (Sub)Task" MenuMainNewTask "n" MENUITEM "Cut" MenuEditCut "x" MENUITEM "Copy" MenuEditCopy "c" MENUITEM "Copy Children" MenuEditCopyChildren "i" MENUITEM "Paste" MenuEditPaste "p" MENUITEM "Paste As Child" MenuEditPasteAsChildren "h" MENUITEM "Add Note" MenuEditAddNote "a" MENUITEM "Delete Task" MenuMainDeleteTask "d" MENUITEM SEPARATOR MENUITEM "Publish to LinkMaster" MenuPublishLinkMaster MENUITEM "Link via LinkMaster" MenuLinkViaLinkMaster MENUITEM "Remove Link" MenuRemoveLinkViaLinkMaster END PULLDOWN "Tree" BEGIN MENUITEM "Delete Children" MenuMainDeleteChildren MENUITEM SEPARATOR MENUITEM "Expand all" MenuMainExpandAll "e" MENUITEM "Collapse all" MenuMainCollapseAll "o" MENUITEM "Collapse father" MenuMainCollapseFather "!" MENUITEM SEPARATOR MENUITEM "Go to top" MenuMainTop "t" MENUITEM "Go to bottom" MenuMainBottom "b" MENUITEM SEPARATOR MENUITEM "Repair Tree" MenuMainRepair END PULLDOWN "View" BEGIN MENUITEM "Clear Subtask View" MenuMainViewAll "v" MENUITEM "Delete Tasks in View" MenuMainReInit MENUITEM SEPARATOR MENUITEM "Project Props." MenuMainPreferences "r" MENUITEM "Display Prefs." MenuMainDisplayPreferences "y" MENUITEM "Flat Filter" MenuMainFlatFilter "f" END END FORM FrmTaskEdit 2 2 156 156 MODAL MENUID MenuNoteEdit BEGIN TITLE "Task Properties" LABEL "Task Description" AUTOID at (6 17) FONT 1 FIELD TaskDesc at (PREVLEFT PREVBOTTOM 146 22) UNDERLINED MULTIPLELINES MAXCHARS 255 AUTOSHIFT LABEL "Value:" LabelValue at (RIGHT@60 PREVBOTTOM+3) NONUSABLE FONT 1 FIELD TaskNumericActual at (PREVRIGHT+1 PREVTOP 30 11) NONUSABLE UNDERLINED MAXCHARS 5 NUMERIC LABEL "/" LabelSlash at (PREVRIGHT PREVTOP) NONUSABLE FONT 1 FIELD TaskNumericLimit at (PREVRIGHT PREVTOP 30 11) NONUSABLE UNDERLINED MAXCHARS 5 NUMERIC LABEL "Type:" AUTOID at (RIGHT@60 PREVBOTTOM+3) FONT 1 POPUPTRIGGER "123456789012345" Pop_Item_Type at (PREVRIGHT+1 PREVTOP auto auto) LEFTANCHOR LIST "Progress" "Numeric" "Action" "Info" Lst_Item_Type at (PREVLEFT PREVTOP 60 44) NONUSABLE BUTTON "icon" Btn_SelectIcon at (PREVRIGHT+2 PREVTOP auto auto) LABEL "Priority:" AUTOID at (RIGHT@60 PREVBOTTOM+3) FONT 1 PUSHBUTTON "1" Btn_Priority_1 at (PREVRIGHT+1 PREVTOP auto auto) GROUP 1 PUSHBUTTON "2" Btn_Priority_2 at (PREVRIGHT+1 PREVTOP auto auto) GROUP 1 PUSHBUTTON "3" Btn_Priority_3 at (PREVRIGHT+1 PREVTOP auto auto) GROUP 1 PUSHBUTTON "4" Btn_Priority_4 at (PREVRIGHT+1 PREVTOP auto auto) GROUP 1 PUSHBUTTON "5" Btn_Priority_5 at (PREVRIGHT+1 PREVTOP auto auto) GROUP 1 PUSHBUTTON "No" Btn_Priority_No at (PREVRIGHT+1 PREVTOP auto auto) GROUP 1 LABEL "Due Date:" AUTOID at (RIGHT@60 PREVBOTTOM+3) FONT 1 POPUPTRIGGER "1234567890123456789012345" Pop_Due_Date at (PREVRIGHT+1 PREVTOP auto auto) LEFTANCHOR LIST "Today" "Tomorrow" "In one week" "No date" "Choose date" Lst_Date at (PREVLEFT PREVTOP 60 55) NONUSABLE LABEL "ToDo Link:" AUTOID at (RIGHT@60 PREVTOP+12) FONT 1 CHECKBOX "" Chk_Edit_ToDo_Link at (PREVRIGHT+1 PREVTOP auto auto) BUTTON "+7" Btn_Plus_Seven at (138 PREVTOP+2 16 auto) BUTTON "\002" Btn_Minus_One at (PREVLEFT PREVBOTTOM+2 8 auto) NOFRAME FONT 4 BUTTON "\003" Btn_Plus_One at (PREVRIGHT PREVTOP 8 auto) NOFRAME FONT 4 LABEL "Category:" AUTOID at (RIGHT@60 PREVTOP-2) FONT 1 POPUPTRIGGER "123456789012345" Pop_Category at (PREVRIGHT+1 PREVTOP auto auto) LEFTANCHOR LIST "" Lst_Category at (PREVLEFT PREVTOP 90 40) NONUSABLE BUTTON "OK" Btn_Edit_Ok at (6 140 auto auto) BUTTON "Cancel" Btn_Edit_Cancel at (PREVRIGHT+10 PREVTOP auto auto) BUTTON "Note" Btn_Edit_Note at (PREVRIGHT+10 PREVTO... [truncated message content] |
|
From: Rick P. <ric...@us...> - 2004-05-29 02:32:38
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7991 Modified Files: Tag: OBJECT_INTERNALS_BRANCH ChooseNameForm.cc ChooseNameForm.h Error.h FormManager.h Makefile PalmForm.h Project.cc Project.h ProjectGUI.cc ProjectList.h ProjectListForm.h ProjectListRS.h progect.def sections.h Log Message: This compiles, I'm not sure if it works correctly or not. Index: Project.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/Project.h,v retrieving revision 1.1.2.12 retrieving revision 1.1.2.13 diff -C2 -d -r1.1.2.12 -r1.1.2.13 *** Project.h 28 Mar 2004 04:00:49 -0000 1.1.2.12 --- Project.h 29 May 2004 02:32:26 -0000 1.1.2.13 *************** *** 31,34 **** --- 31,35 ---- #include "PalmDBInfo.h" #include "Error.h" + #include "sections.h" class Project *************** *** 36,43 **** public: Project():dbOpen(false) ! {} ; ! Project(const PalmDBInfo &newName_); String getName(void) --- 37,44 ---- public: Project():dbOpen(false) ! {} ; ! Project(const PalmDBInfo &newName_) PROJSECT; String getName(void) *************** *** 62,76 **** ; ! Error openProject(UInt16 mode=dmModeReadOnly); ! Error renameProject(const PalmDBInfo &newInfo); ! Error deleteProject(void); ! Error duplicateProject(const PalmDBInfo &newName); static Error createProject(const PalmDBInfo &createdProject); ! UInt16 size(void); // getTaskIterator(); // or whatever we do to grab an iterator --- 63,77 ---- ; ! Error openProject(UInt16 mode=dmModeReadOnly) PROJSECT; ! Error renameProject(const PalmDBInfo &newInfo) PROJSECT; ! Error deleteProject(void) PROJSECT; ! Error duplicateProject(const PalmDBInfo &newName) PROJSECT; static Error createProject(const PalmDBInfo &createdProject); ! UInt16 size(void) PROJSECT; // getTaskIterator(); // or whatever we do to grab an iterator Index: progect.def =================================================================== RCS file: /cvsroot/progect/progect/progect.def,v retrieving revision 1.1.12.2 retrieving revision 1.1.12.3 diff -C2 -d -r1.1.12.2 -r1.1.12.3 *** progect.def 8 Mar 2004 19:38:45 -0000 1.1.12.2 --- progect.def 29 May 2004 02:32:26 -0000 1.1.12.3 *************** *** 1,2 **** application { OProgect obPG } ! multiple code { uisect } --- 1,2 ---- application { OProgect obPG } ! multiple code { uisect projsect } Index: ProjectGUI.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectGUI.cc,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -C2 -d -r1.1.2.9 -r1.1.2.10 *** ProjectGUI.cc 28 Mar 2004 04:00:49 -0000 1.1.2.9 --- ProjectGUI.cc 29 May 2004 02:32:26 -0000 1.1.2.10 *************** *** 45,53 **** error = selectProjectName(newProjectInfo); ! if (error.error()) return error; error=Project::createProject(newProjectInfo); ! if (error.error()) return error; --- 45,53 ---- error = selectProjectName(newProjectInfo); ! if (error.stopExecution()) return error; error=Project::createProject(newProjectInfo); ! if (error.stopExecution()) return error; *************** *** 68,72 **** error=selectProjectName(newName); ! if (error.error()) return error; --- 68,72 ---- error=selectProjectName(newName); ! if (error.stopExecution()) return error; *************** *** 85,89 **** error=selectProjectName(newName); ! if (error.error()) return error; --- 85,89 ---- error=selectProjectName(newName); ! if (error.stopExecution()) return error; *************** *** 104,109 **** Error ProjectGUI::selectProjectName(PalmDBInfo &defaultName) { ! defaultName= ShowChooseNameDialog(defaultName); if ( (defaultName.getName().StrLen() == 0) --- 104,114 ---- Error ProjectGUI::selectProjectName(PalmDBInfo &defaultName) { ! Error returnValue; ! ! returnValue= ShowChooseNameDialog(defaultName); + if (returnValue.stopExecution()) + return returnValue; + if ( (defaultName.getName().StrLen() == 0) Index: ProjectListForm.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectListForm.h,v retrieving revision 1.1.2.17 retrieving revision 1.1.2.18 diff -C2 -d -r1.1.2.17 -r1.1.2.18 *** ProjectListForm.h 28 Mar 2004 03:08:08 -0000 1.1.2.17 --- ProjectListForm.h 29 May 2004 02:32:26 -0000 1.1.2.18 *************** *** 56,60 **** Error error = ProjectGUI::create(createdProject); ! if (!error.error()) error=createdProject.open(); --- 56,60 ---- Error error = ProjectGUI::create(createdProject); ! if (!error.stopExecution()) error=createdProject.open(); Index: ProjectListRS.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectListRS.h,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** ProjectListRS.h 26 Mar 2004 02:26:55 -0000 1.1.2.4 --- ProjectListRS.h 29 May 2004 02:32:26 -0000 1.1.2.5 *************** *** 52,76 **** } ! void drawCustomTableItem(const UInt16 recordNumber, const UInt8 virtualColumn, const RectangleType *bound); }; typedef ProjectListRS* ProjectListRSPtr; - /* - class ProjectListGUI : public ProjectListRecordSource - { - public: - // handle singleton logic - static ProjectListGUI* getProjectListGUIObject(void); - private: - ProjectListGUI() - {} - ; - static ProjectListGUI *singleton; - - // The Progect Application need to be able to call cleanup on this class - friend void ProgectApplication::deInitializeApplicationData(void); - static void cleanup(void); - }; - typedef ProjectListRS* ProjectListRSPtr; - */ #endif --- 52,58 ---- } ! void drawCustomTableItem(const UInt16 recordNumber, const UInt8 virtualColumn, const RectangleType *bound) PROJSECT; }; typedef ProjectListRS* ProjectListRSPtr; #endif Index: ChooseNameForm.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/ChooseNameForm.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** ChooseNameForm.h 25 Mar 2004 03:10:02 -0000 1.1.2.1 --- ChooseNameForm.h 29 May 2004 02:32:26 -0000 1.1.2.2 *************** *** 27,33 **** #include "String.h" #include "PalmDBInfo.h" ! // returns the selected destProjectName, or an empty string if cancelled ! PalmDBInfo ShowChooseNameDialog(PalmDBInfo databaseInfo); #endif --- 27,33 ---- #include "String.h" #include "PalmDBInfo.h" + #include "Error.h" ! Error ShowChooseNameDialog(PalmDBInfo databaseInfo); #endif Index: PalmForm.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/PalmForm.h,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -C2 -d -r1.1.2.8 -r1.1.2.9 *** PalmForm.h 27 Mar 2004 04:15:10 -0000 1.1.2.8 --- PalmForm.h 29 May 2004 02:32:26 -0000 1.1.2.9 *************** *** 36,42 **** { public: ! PalmForm( UInt16 _formID ) UISECT; ! PalmForm( const PalmForm& _rhs ) UISECT; ! virtual ~PalmForm( void ) UISECT; PalmForm& operator=( const PalmForm& _rhs ) UISECT; --- 36,42 ---- { public: ! PalmForm( UInt16 _formID ); ! PalmForm( const PalmForm& _rhs ); ! virtual ~PalmForm( void ); PalmForm& operator=( const PalmForm& _rhs ) UISECT; Index: Error.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/Error.h,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** Error.h 28 Mar 2004 03:08:08 -0000 1.1.2.4 --- Error.h 29 May 2004 02:32:26 -0000 1.1.2.5 *************** *** 45,54 **** --- 45,74 ---- { hasError = ((palmOSError_ != errNone)||(dialogResource != 0)); + hasCancelled=false; } ; + + Boolean stopExecution(void) + { + return hasError||hasCancelled; + }; + Boolean error(void) { return hasError; }; + + // I don't like this whole cancelled thing, but I can't think of a better + // way to be able to return the fact that the operation was cancelled. + // But the user really should not be notified that the operation was cancelled + // all the time. + Boolean cancelled(void) + { + return hasCancelled; + }; + void setCancelled(const Boolean cancelled_) + { + hasCancelled=cancelled_; + }; UInt16 showErrorToUser(void); *************** *** 57,60 **** --- 77,81 ---- UInt16 dialogResource; Boolean hasError; + Boolean hasCancelled; String firstString; String secondString; Index: Makefile =================================================================== RCS file: /cvsroot/progect/progect/Makefile,v retrieving revision 1.61.4.22 retrieving revision 1.61.4.23 diff -C2 -d -r1.61.4.22 -r1.61.4.23 *** Makefile 25 Mar 2004 23:07:40 -0000 1.61.4.22 --- Makefile 29 May 2004 02:32:26 -0000 1.61.4.23 *************** *** 23,26 **** --- 23,28 ---- TARGET = progect + SKIN = progect-skin + APPNAME = "OProgect" # 'lbPG' is a registred palm creator ID *************** *** 29,104 **** REVISION = 0_31b1 ! TRANSLATIONS = de cs fr ja it sk ko zh es en ! prcs = $(TRANSLATIONS:%=progect-%.prc) ! resfiles := $(TRANSLATIONS:%=bin-%.res) ! rcpfiles := $(TRANSLATIONS:%=%.rcp) ! rcpsourcefiles := $(TRANSLATIONS:%=%.rcp.source) ! rcpmarkupfiles := $(TRANSLATIONS:%=%.rcp.markup) OBJSTOTEST = TableHandler.o FormManager.o PalmForm.o ProjectListDB.o ProjectList.o util.o SimpleDeque.o Task.o Project.o String.o ProjectGUI.o ProgectApplication.o ProjectListForm.o ProjectListRS.o ChooseNameForm.o PalmDBInfo.o Error.o OBJS = $(OBJSTOTEST) main.o - #OBJS = $(TARGET).o ToDoDB.o MemoDB.o task.o progectdb.o flat.o link.o \ - # linkaware.o AddressDB.o icon.o doc.o category.o \ - # xb.o beam.o aftersync.o projlistGUI.o projlistMODEL.o palmMODEL.o ! #LIBPATH = -L/usr/local/palmdev/sdk3.5/lib ! #LIBPATH = -L/cygdrive/d/PalmDev/sdk-5/lib ! # The PalmOSGlue is a required library ! #LIBS = -lPalmOSGlue $(LIBPATH) ! LIBS = -lnoexcept -lPalmOSGlue $(LIBPATH) CC = m68k-palmos-g++ CXX = m68k-palmos-g++ - #CC = m68k-palmos-gcc DEBUGCFLAGS = -g -O2 -Wall -mdebug-labels DEBUGCXXFLAGS = -g -O2 -Wall -mdebug-labels -fno-exceptions -fno-rtti ! # You need prc-tools 2.0 or newer with a new SDK (with 3.5) ! #CFLAGS = -Wall -O2 -ISony -ISony/System -ISony/Libraries CFLAGS = -Wall -O2 -UDEBUGMETHOD -DDEBUGMETHOD=0 CXXFLAGS = -Wall -O2 -UDEBUGMETHOD -DDEBUGMETHOD=0 -fno-exceptions -fno-rtti ! LDFLAGS = -g ! #PILRC = pilrc28/pilrc ! #PILRC = pilrc ! PILRC = pilrc ! OBJRES = m68k-palmos-obj-res ! NM = m68k-palmos-nm ! BUILDPRC = build-prc ! PILOTXFER = pilot-xfer ! MG = m68k-palmos-multigen - #ricktest: - # echo $(prcs) - # - debug: - $(MAKE) CFLAGS="$(DEBUGCFLAGS)" CXXFLAGS="$(DEBUGCXXFLAGS)" $(TARGET)-en.prc single: $(TARGET)-en.prc - all: $(TARGET)-it.prc $(TARGET)-de.prc $(TARGET)-cs.prc $(TARGET)-fr.prc $(TARGET)-ja.prc $(TARGET)-en.prc $(TARGET)-ko.prc $(TARGET)-sk.prc $(TARGET)-zh.prc $(TARGET)-es.prc ! release: clean ! $(MAKE) $(TARGET)-de.prc ! $(MAKE) $(TARGET)-cs.prc ! $(MAKE) $(TARGET)-fr.prc ! $(MAKE) $(TARGET)-ja.prc ! $(MAKE) $(TARGET)-it.prc ! $(MAKE) $(TARGET)-sk.prc ! $(MAKE) $(TARGET)-ko.prc ! $(MAKE) $(TARGET)-zh.prc ! $(MAKE) $(TARGET)-es.prc ! $(MAKE) $(TARGET)-en.prc ! all: release ! sections: ! m68k-palmos-size -A progect ! progect-sections.o : progect-sections.s ! $(CC) $(CFLAGS) -c progect-sections.s ! progect-sections.s progect-sections.ld : progect.def ! $(MG) progect.def .S.o: --- 31,124 ---- REVISION = 0_31b1 ! PILRC = pilrc ! OBJRES = m68k-palmos-obj-res ! NM = m68k-palmos-nm ! BUILDPRC = build-prc ! PILOTXFER = pilot-xfer ! MG = m68k-palmos-multigen ! MULTILINK = m68k-palmos-multilink ! ! # Progect will now be a single english PRC with skins to handle different resolutions and languages ! # this way we can let the user choose the language/resolution at runtime. ! MAIN_PRC_SUFFIXES = en ! SKIN_SUFFIXES = de cs fr ja it sk ko zh es ! ! ja-PILRC_FLAGS = -Fj -L JA ! ko-PILRC_FLAGS = -Fkt -L KO ! fr-PILRC_FLAGS = -ro -L FR ! de-PILRC_FLAGS = -L DE ! cs-PILRC_FLAGS = -L CS ! it-PILRC_FLAGS = -L IT ! sk-PILRC_FLAGS = -L SK ! zh-PILRC_FLAGS = -L BIG5 -F5 ! es-PILRC_FLAGS = -L ES ! ! PRCS = $(MAIN_PRC_SUFFIXES:%=$(TARGET)-%.prc) ! SKINS = $(SKIN_SUFFIXES:%=$(SKIN)-%.prc) ! ROLIST = $(MAIN_PRC_SUFFIX:%=%.ro) $(TRANSLATIONS:%=%.ro) ! ! #resfiles := $(TRANSLATIONS:%=bin-%.res) ! #rcpfiles := $(TRANSLATIONS:%=%.rcp) ! #rcpsourcefiles := $(TRANSLATIONS:%=%.rcp.source) ! #rcpmarkupfiles := $(TRANSLATIONS:%=%.rcp.markup) OBJSTOTEST = TableHandler.o FormManager.o PalmForm.o ProjectListDB.o ProjectList.o util.o SimpleDeque.o Task.o Project.o String.o ProjectGUI.o ProgectApplication.o ProjectListForm.o ProjectListRS.o ChooseNameForm.o PalmDBInfo.o Error.o OBJS = $(OBJSTOTEST) main.o ! #LIBS = -L/opt/palmdev/sdk-5r3/lib/m68k-palmos-coff -stdlib -lnoexcept -lPalmOSGlue ! LIBS = -L/opt/palmdev/sdk-5r3/lib/m68k-palmos-coff -lPalmOSGlue -lc -lnoexcept ! #LIBS = -L/opt/palmdev/sdk-5r3/lib/m68k-palmos-coff -stdlib CC = m68k-palmos-g++ CXX = m68k-palmos-g++ DEBUGCFLAGS = -g -O2 -Wall -mdebug-labels DEBUGCXXFLAGS = -g -O2 -Wall -mdebug-labels -fno-exceptions -fno-rtti ! ! # You need prc-tools 2.3 or newer with a new SDK (4.1+) CFLAGS = -Wall -O2 -UDEBUGMETHOD -DDEBUGMETHOD=0 CXXFLAGS = -Wall -O2 -UDEBUGMETHOD -DDEBUGMETHOD=0 -fno-exceptions -fno-rtti ! CFLAGS = $(DEBUGCFLAGS) ! CXXFLAGS = $(DEBUGCXXFLAGS) ! LDFLAGS = -g single: $(TARGET)-en.prc ! all: $(PRCS) $(SKINS) ! # # Create executable before prc ! # $(TARGET): $(OBJS) progect-sections.ld progect-sections.o ! # $(CC) $(CFLAGS) -o $(TARGET) $(OBJS) progect-sections.o progect-sections.ld $(LIBS) ! # # create prc's ! # $(TARGET)-%.prc : $(OBJS) $(TARGET)-%.ro $(TARGET) ! # $(BUILDPRC) -o $@ progect.def progect progect-$*.ro ! $(TARGET)-%.prc : $(OBJS) $(TARGET)-%.ro ! -rm *.grc ! # m68k-palmos-multilink -fid $(APPID) $(OBJS) CrackedLibrary/_eh.o CrackedLibrary/opdel.o CrackedLibrary/opnew.o CrackedLibrary/new.o CrackedLibrary/exception.o CrackedLibrary/frame.o $(LIBS) ! # m68k-palmos-multilink -fid $(APPID) $(OBJS) CrackedLibrary/opnewnt.o CrackedLibrary/opvnewnt.o CrackedLibrary/opdelnt.o CrackedLibrary/opvdelnt.o CrackedLibrary/_eh.o $(LIBS) ! m68k-palmos-multilink -fid $(APPID) $(OBJS) CrackedLibrary/_pure.o CrackedLibrary/frame.o CrackedLibrary/_eh.o CrackedLibrary/exception.o $(LIBS) ! build-prc --output $@ --name $(APPNAME) --creator $(APPID) $(TARGET)-$*.ro *.grc ! #create skins ! $(SKIN)-%.prc : $(OBJS) $(SKIN)-$*.ro ! build-prc --output $@ --name $(APPNAME) --creator $(APPID) $(SKIN)-$*.ro ! ! # convert from rcp to ro files ! %.ro : %.rcp ! $(PILRC) $($*-PILRC_FLAGS) -ro progect-$< ! ! # sections: ! # m68k-palmos-size -A progect ! ! # progect-sections.o : progect-sections.s ! # $(CC) $(CFLAGS) -c progect-sections.s ! ! # progect-sections.s progect-sections.ld : progect.def ! # $(MG) progect.def .S.o: *************** *** 108,334 **** $(CC) $(CFLAGS) $(CSFLAGS) $< #%.prc : %.res # $(BUILDPRC) -o $@ progect.def *.bin # ! $(TARGET)-en.prc: $(TARGET) progect-en.ro ! $(BUILDPRC) -o progect-en.prc progect.def progect progect-en.ro ! ! $(TARGET)-ja.prc: $(TARGET) progect-ja.ro ! $(BUILDPRC) -o progect-ja.prc progect.def progect progect-ja.ro ! $(TARGET)-sk.prc: $(TARGET) progect-sk.ro ! $(BUILDPRC) -o progect-sk.prc progect.def progect progect-sk.ro ! $(TARGET)-ko.prc: $(TARGET) progect-ko.ro ! $(BUILDPRC) -o progect-ko.prc progect.def progect progect-ko.ro ! $(TARGET)-de.prc: $(TARGET) progect-de.ro ! $(BUILDPRC) -o progect-de.prc progect.def progect progect-de.ro ! $(TARGET)-fr.prc: $(TARGET) progect-fr.ro ! $(BUILDPRC) -o progect-fr.prc progect.def progect progect-fr.ro ! $(TARGET)-cs.prc: $(TARGET) progect-cs.ro ! $(BUILDPRC) -o progect-cs.prc progect.def progect progect-cs.ro ! $(TARGET)-it.prc: $(TARGET) progect-it.ro ! $(BUILDPRC) -o progect-it.prc progect.def progect progect-it.ro ! $(TARGET)-zh.prc: $(TARGET) progect-zh.ro ! $(BUILDPRC) -o progect-zh.prc progect.def progect progect-zh.ro ! $(TARGET)-es.prc: $(TARGET) progect-es.ro ! $(BUILDPRC) -o progect-es.prc progect.def progect progect-es.ro ! progect-en.ro: $(TARGET).rcp ! cat $(TARGET).rcp >$(TARGET)-en.rcp ! $(PILRC) -ro $(TARGET)-en.rcp ! progect-ja.ro: $(TARGET).rcp ja.rcp ! cat ja.rcp $(TARGET).rcp >progect-ja.rcp ! $(PILRC) -ro -Fj -L JA progect-ja.rcp ! progect-ko.ro: $(TARGET).rcp ko.rcp ! cat ko.rcp $(TARGET).rcp >progect-ko.rcp ! $(PILRC) -ro -Fkt -L KO progect-ko.rcp ! progect-fr.ro: $(TARGET).rcp fr.rcp ! cat fr.rcp $(TARGET).rcp >progect-fr.rcp ! $(PILRC) -ro -L FR progect-fr.rcp ! progect-de.ro: $(TARGET).rcp de.rcp ! cat de.rcp $(TARGET).rcp >progect-de.rcp ! $(PILRC) -ro -L DE progect-de.rcp ! progect-cs.ro: $(TARGET).rcp cs.rcp ! cat cs.rcp $(TARGET).rcp >progect-cs.rcp ! $(PILRC) -ro -L CS progect-cs.rcp ! progect-it.ro: $(TARGET).rcp it.rcp ! cat it.rcp $(TARGET).rcp >progect-it.rcp ! $(PILRC) -ro -L IT progect-it.rcp ! progect-sk.ro: $(TARGET).rcp sk.rcp ! cat sk.rcp $(TARGET).rcp >progect-sk.rcp ! $(PILRC) -ro -L SK progect-sk.rcp ! progect-zh.ro: $(TARGET).rcp zh.rcp ! cat zh.rcp $(TARGET).rcp >progect-zh.rcp ! $(PILRC) -ro -L BIG5 -F5 progect-zh.rcp ! progect-es.ro: $(TARGET).rcp es.rcp ! cat es.rcp $(TARGET).rcp >progect-es.rcp ! $(PILRC) -ro -L ES progect-es.rcp ! $(TARGET): $(OBJS) progect-sections.ld progect-sections.o ! $(CC) $(CFLAGS) -o $(TARGET) $(OBJS) progect-sections.o progect-sections.ld $(LIBS) ! style: ! astyle --style=ansi *.h *.cc *.c ! send: $(TARGET).prc ! $(PILOTXFER) -i $(TARGET).prc ! depend: ! makedepend -Y -I. *.c ! clean: ! -rm -f *.[oa] $(TARGET) *.bin progect-en.ro progect-ja.ro progect-cs.ro progect-it.ro progect-ko.ro progect-sk.ro progect-fr.ro progect-de.ro progect-es.ro *.prc Makefile.bak *.s *.ld *~ *.bak ! veryclean: clean cleantest ! -rm -f $(TARGET).prc ! tags: ! ctags -R * ! distrib: release ! cp progect-en.prc ../progect_$(REVISION)-en.prc ! rm -rf ../tar_creation ! mkdir ../tar_creation ! mkdir ../tar_creation/progect ! -cp *.prc ../tar_creation/progect ! -cvs2cl --file CHANGELOG --separate-header --utc ! -cp CHANGELOG HISTORY README COPYING lbPG-*.pdb DB3ICONS.txt ../tar_creation/progect ! -cd ../tar_creation; \ ! unix2dos CHANGELOG HISTORY README COPYING DB3ICONS.TXT; \ ! mv CHANGELOG CHANGELOG.TXT; mv HISTORY HISTORY.TXT; \ ! mv README README.TXT; mv COPYING COPYING.TXT; \ ! zip -r progect_$(REVISION)_langs.zip *; \ ! mv progect_* ..; ! rm -rf ../tar_creation ! $(MAKE) clean ! cd ..; \ ! zip -r progect_$(REVISION)_source.zip progect ! fetch-progect: ! $(PILOTXFER) -f lbPG-Progect ! mv lbPG-Progect.pdb sample_progect.pdb ! # convert translation source into rcp files ! # To use this functionality you need the palm-trans-utils package from www.sourceforge.net. ! %.rcp : %.rcp.source ! dos2unix $< ! convert_textfile_to_translation_block $< > $@ ! # DO NOT DELETE ! # The test runner currently wants to see a target in this makefile called ! # "unittestable". The rules for this target should just do anything that is ! # necessary to make the code that is going to be tested testable. For the ! # counter example, no action is necessary. ! MULTIGEN = m68k-palmos-multigen ! TESTDIR = PalmCUnit ! TESTINGOBJS = \ ! $(TESTDIR)/PalmCUnit.o \ ! $(TESTDIR)/TestSuite.o \ ! $(TESTDIR)/TaskTestSuite.o \ ! $(TESTDIR)/SimpleDequeTestSuite.o \ ! $(TESTDIR)/TestRun.o \ ! $(TESTDIR)/TestDB.o \ ! $(TESTDIR)/AssertImpl.o \ ! $(TESTDIR)/Util.o ! cleantest: ! -rm -f $(TESTDIR)/*.[oa] ! test: ! $(MAKE) CFLAGS="$(DEBUGCFLAGS)" CXXFLAGS="$(DEBUGCXXFLAGS)" ProgectTests.prc ! ProgectTests.prc: progect-tests PalmCUnit.ro ! $(BUILDPRC) $(TESTDIR)/PalmCUnit.def -o ProgectTests.prc PalmCUnit.ro progect-tests ! # This is the target that makes the initial object code of the runner. NOTE: ! # it outputs a .map file that will contain any error messages if the build ! # encounters a problem. The map file is to help with debugging segmenting ! # complications that can arise from larger code bases. ! progect-tests: $(OBJSTOTEST) $(TESTINGOBJS) PalmCUnit-sections.o PalmCUnit-sections.ld ! $(CC) $(LDFLAGS) $(OBJSTOTEST) $(TESTINGOBJS) PalmCUnit-sections.o $(LIBS) -o $@ PalmCUnit-sections.ld ! # $(CC) -Xlinker -M -Xlinker --cref $(LDFLAGS) $(OBJSTOTEST) $(TESTINGOBJS) PalmCUnit-sections.o $(LIBS) -o $@ PalmCUnit-sections.ld > PalmCUnit.map 2>&1 ! $(TESTINGOBJS): $(TESTDIR)/PalmCUnitRsc.h ! PalmCUnit.ro: $(TESTDIR)/PalmCUnit.rcp ! $(PILRC) -ro -allowEditID -H $(TESTDIR)/PalmCUnitRsc.h -q $(TESTDIR)/PalmCUnit.rcp PalmCUnit.ro ! $(TESTDIR)/PalmCUnitRsc.h: $(TESTDIR)/PalmCUnit.rcp ! $(PILRC) -ro -allowEditID -H $(TESTDIR)/PalmCUnitRsc.h -q $(TESTDIR)/PalmCUnit.rcp PalmCUnit.ro ! PalmCUnit-sections.o: PalmCUnit-sections.s ! $(CC) -c PalmCUnit-sections.s - PalmCUnit-sections.s PalmCUnit-sections.ld: $(TESTDIR)/PalmCUnit.def - $(MULTIGEN) $(TESTDIR)/PalmCUnit.def ! ## CUnit framework objs here ! PalmCUnit.o: $(TESTDIR)/PalmCUnit.c ! $(CC) $(CFLAGS) -c $< ! TestSuite.o: $(TESTDIR)/TestSuite.c ! $(CC) $(CFLAGS) -c $< ! TaskTestSuite.o: $(TESTDIR)/TaskTestSuite.c ! $(CC) $(CFLAGS) -c $< ! SimpleDequeTestSuite.o: $(TESTDIR)/SimpleDequeTestSuite.c ! $(CC) $(CFLAGS) -c $< ! TestRun.o: $(TESTDIR)/TestRun.c ! $(CC) $(CFLAGS) -c $< ! TestDB.o: $(TESTDIR)/TestDB.c ! $(CC) $(CFLAGS) -c $< ! AssertImpl.o: $(TESTDIR)/AssertImpl.c ! $(CC) $(CFLAGS) -c $< - Util.o: $(TESTDIR)/Util.c - $(CC) $(CFLAGS) -c $< ! AddressDB.o: AddressDB.h Address.h linkaware.h progect.h progectRsc.h ! aftersync.o: aftersync.h linkaware.h progect.h progectRsc.h ! beam.o: beam.h ! category.o: linkaware.h progect.h progectRsc.h ! doc.o: doc.h linkaware.h progect.h progectRsc.h task.h ! flat.o: flat.h linkaware.h progectdb.h progect.h progectRsc.h task.h xb.h ! history.o: history.h linkaware.h progectdb.h progect.h ! icon.o: icon.h linkaware.h MemoDB.h progect.h progectRsc.h task.h xb.h ! linkaware.o: linkaware.h ! link.o: AddressDB.h flat.h linkaware.h link.h MemoDB.h MemoMain.h progectdb.h ! link.o: progect.h progectRsc.h task.h xb.h ! MemoDB.o: linkaware.h MemoDB.h MemoMain.h progect.h progectRsc.h ! progect_beam.o: AddressDB.h beam.h btm.h category.h doc.h flat.h icon.h ! progect_beam.o: linkaware.h link.h MemoDB.h progectdb.h progect.h progectRsc.h ! progect_beam.o: task.h ToDoDB.h ! progectdb.o: history.h linkaware.h progectdb.h progect.h progectRsc.h task.h ! progectdb.o: xb.h ! progect.o: AddressDB.h aftersync.h beam.h btm.h category.h doc.h flat.h ! progect.o: handera/Trg.h handera/Vga.h history.h icon.h linkaware.h link.h ! progect.o: MemoDB.h progectdb.h progect.h progectRsc.h task.h ToDoDB.h xb.h ! task.o: AddressDB.h linkaware.h MemoDB.h progectdb.h progect.h progectRsc.h ! task.o: task.h ToDoDB.h xb.h ! ToDoDB.o: linkaware.h progect.h progectRsc.h ToDoDB.h ToDo.h ! xb.o: linkaware.h progect.h progectRsc.h task.h xb.h --- 128,399 ---- $(CC) $(CFLAGS) $(CSFLAGS) $< + clean: + -rm -f *.[oa] $(TARGET) *.bin $(ROLIST) $(PRCS) $(SKINS) Makefile.bak *.s *.ld *~ *.bak + + debug: + $(MAKE) CFLAGS="$(DEBUGCFLAGS)" CXXFLAGS="$(DEBUGCXXFLAGS)" $(PRC) + + + + + + + + + + #single: $(TARGET)-en.prc + #all: $(TARGET)-it.prc $(TARGET)-de.prc $(TARGET)-cs.prc $(TARGET)-fr.prc $(TARGET)-ja.prc $(TARGET)-en.prc $(TARGET)-ko.prc $(TARGET)-sk.prc $(TARGET)-zh.prc $(TARGET)-es.prc + + # release: clean + # $(MAKE) $(TARGET)-de.prc + # $(MAKE) $(TARGET)-cs.prc + # $(MAKE) $(TARGET)-fr.prc + # $(MAKE) $(TARGET)-ja.prc + # $(MAKE) $(TARGET)-it.prc + # $(MAKE) $(TARGET)-sk.prc + # $(MAKE) $(TARGET)-ko.prc + # $(MAKE) $(TARGET)-zh.prc + # $(MAKE) $(TARGET)-es.prc + # $(MAKE) $(TARGET)-en.all + + #prc: release + # + #sections: + # m68k-palmos-size -A progect + + # progect-sections.o : progect-sections.s + # $(CC) $(CFLAGS) -c progect-sections.s + + # progect-sections.s progect-sections.ld : progect.def + # $(MG) progect.def + + # .S.o: + # $(CC) $(CFLAGS) $(TARGETFLAGS) -c $< + + # .c.s: + # $(CC) $(CFLAGS) $(CSFLAGS) $< + #%.prc : %.res # $(BUILDPRC) -o $@ progect.def *.bin # ! # $(TARGET)-en.prc: $(TARGET) progect-en.ro ! # $(BUILDPRC) -o progect-en.prc progect.def progect progect-en.ro ! # $(TARGET)-ja.prc: $(TARGET) progect-ja.ro ! # $(BUILDPRC) -o progect-ja.prc progect.def progect progect-ja.ro ! # $(TARGET)-sk.prc: $(TARGET) progect-sk.ro ! # $(BUILDPRC) -o progect-sk.prc progect.def progect progect-sk.ro ! # $(TARGET)-ko.prc: $(TARGET) progect-ko.ro ! # $(BUILDPRC) -o progect-ko.prc progect.def progect progect-ko.ro ! # $(TARGET)-de.prc: $(TARGET) progect-de.ro ! # $(BUILDPRC) -o progect-de.prc progect.def progect progect-de.ro ! # $(TARGET)-fr.prc: $(TARGET) progect-fr.ro ! # $(BUILDPRC) -o progect-fr.prc progect.def progect progect-fr.ro ! # $(TARGET)-cs.prc: $(TARGET) progect-cs.ro ! # $(BUILDPRC) -o progect-cs.prc progect.def progect progect-cs.ro ! # $(TARGET)-it.prc: $(TARGET) progect-it.ro ! # $(BUILDPRC) -o progect-it.prc progect.def progect progect-it.ro ! # $(TARGET)-zh.prc: $(TARGET) progect-zh.ro ! # $(BUILDPRC) -o progect-zh.prc progect.def progect progect-zh.ro ! # $(TARGET)-es.prc: $(TARGET) progect-es.ro ! # $(BUILDPRC) -o progect-es.prc progect.def progect progect-es.ro ! # progect-en.ro: $(TARGET).rcp ! # cat $(TARGET).rcp >$(TARGET)-en.rcp ! # $(PILRC) -ro $(TARGET)-en.rcp ! # progect-ja.ro: $(TARGET).rcp ja.rcp ! # cat ja.rcp $(TARGET).rcp >progect-ja.rcp ! # $(PILRC) -ro -Fj -L JA progect-ja.rcp ! # progect-ko.ro: $(TARGET).rcp ko.rcp ! # cat ko.rcp $(TARGET).rcp >progect-ko.rcp ! # $(PILRC) -ro -Fkt -L KO progect-ko.rcp ! # progect-fr.ro: $(TARGET).rcp fr.rcp ! # cat fr.rcp $(TARGET).rcp >progect-fr.rcp ! # $(PILRC) -ro -L FR progect-fr.rcp ! # progect-de.ro: $(TARGET).rcp de.rcp ! # cat de.rcp $(TARGET).rcp >progect-de.rcp ! # $(PILRC) -ro -L DE progect-de.rcp ! # progect-cs.ro: $(TARGET).rcp cs.rcp ! # cat cs.rcp $(TARGET).rcp >progect-cs.rcp ! # $(PILRC) -ro -L CS progect-cs.rcp ! # progect-it.ro: $(TARGET).rcp it.rcp ! # cat it.rcp $(TARGET).rcp >progect-it.rcp ! # $(PILRC) -ro -L IT progect-it.rcp ! # progect-sk.ro: $(TARGET).rcp sk.rcp ! # cat sk.rcp $(TARGET).rcp >progect-sk.rcp ! # $(PILRC) -ro -L SK progect-sk.rcp ! # progect-zh.ro: $(TARGET).rcp zh.rcp ! # cat zh.rcp $(TARGET).rcp >progect-zh.rcp ! # $(PILRC) -ro -L BIG5 -F5 progect-zh.rcp ! # progect-es.ro: $(TARGET).rcp es.rcp ! # cat es.rcp $(TARGET).rcp >progect-es.rcp ! # $(PILRC) -ro -L ES progect-es.rcp ! # $(TARGET): $(OBJS) progect-sections.ld progect-sections.o ! # $(CC) $(CFLAGS) -o $(TARGET) $(OBJS) progect-sections.o progect-sections.ld $(LIBS) ! # style: ! # astyle --style=ansi *.h *.cc *.c ! # send: $(TARGET).prc ! # $(PILOTXFER) -i $(TARGET).prc ! # depend: ! # makedepend -Y -I. *.c ! # clean: ! # -rm -f *.[oa] $(TARGET) *.bin progect-en.ro progect-ja.ro progect-cs.ro progect-it.ro progect-ko.ro progect-sk.ro progect-fr.ro progect-de.ro progect-es.ro *.prc Makefile.bak *.s *.ld *~ *.bak ! # veryclean: clean cleantest ! # -rm -f $(TARGET).prc ! # tags: ! # ctags -R * ! # distrib: release ! # cp progect-en.prc ../progect_$(REVISION)-en.prc ! # rm -rf ../tar_creation ! # mkdir ../tar_creation ! # mkdir ../tar_creation/progect ! # -cp *.prc ../tar_creation/progect ! # -cvs2cl --file CHANGELOG --separate-header --utc ! # -cp CHANGELOG HISTORY README COPYING lbPG-*.pdb DB3ICONS.txt ../tar_creation/progect ! # -cd ../tar_creation; \ ! # unix2dos CHANGELOG HISTORY README COPYING DB3ICONS.TXT; \ ! # mv CHANGELOG CHANGELOG.TXT; mv HISTORY HISTORY.TXT; \ ! # mv README README.TXT; mv COPYING COPYING.TXT; \ ! # zip -r progect_$(REVISION)_langs.zip *; \ ! # mv progect_* ..; ! # rm -rf ../tar_creation ! # $(MAKE) clean ! # cd ..; \ ! # zip -r progect_$(REVISION)_source.zip progect ! # fetch-progect: ! # $(PILOTXFER) -f lbPG-Progect ! # mv lbPG-Progect.pdb sample_progect.pdb + # # convert translation source into rcp files + # # To use this functionality you need the palm-trans-utils package from www.sourceforge.net. + # %.rcp : %.rcp.source + # dos2unix $< + # convert_textfile_to_translation_block $< > $@ ! # # The test runner currently wants to see a target in this makefile called ! # # "unittestable". The rules for this target should just do anything that is ! # # necessary to make the code that is going to be tested testable. For the ! # # counter example, no action is necessary. ! # MULTIGEN = m68k-palmos-multigen ! # TESTDIR = PalmCUnit ! # TESTINGOBJS = \ ! # $(TESTDIR)/PalmCUnit.o \ ! # $(TESTDIR)/TestSuite.o \ ! # $(TESTDIR)/TaskTestSuite.o \ ! # $(TESTDIR)/SimpleDequeTestSuite.o \ ! # $(TESTDIR)/TestRun.o \ ! # $(TESTDIR)/TestDB.o \ ! # $(TESTDIR)/AssertImpl.o \ ! # $(TESTDIR)/Util.o ! # cleantest: ! # -rm -f $(TESTDIR)/*.[oa] ! # test: ! # $(MAKE) CFLAGS="$(DEBUGCFLAGS)" CXXFLAGS="$(DEBUGCXXFLAGS)" ProgectTests.prc ! # ProgectTests.prc: progect-tests PalmCUnit.ro ! # $(BUILDPRC) $(TESTDIR)/PalmCUnit.def -o ProgectTests.prc PalmCUnit.ro progect-tests ! # # This is the target that makes the initial object code of the runner. NOTE: ! # # it outputs a .map file that will contain any error messages if the build ! # # encounters a problem. The map file is to help with debugging segmenting ! # # complications that can arise from larger code bases. ! # progect-tests: $(OBJSTOTEST) $(TESTINGOBJS) PalmCUnit-sections.o PalmCUnit-sections.ld ! # $(CC) $(LDFLAGS) $(OBJSTOTEST) $(TESTINGOBJS) PalmCUnit-sections.o $(LIBS) -o $@ PalmCUnit-sections.ld ! # # $(CC) -Xlinker -M -Xlinker --cref $(LDFLAGS) $(OBJSTOTEST) $(TESTINGOBJS) PalmCUnit-sections.o $(LIBS) -o $@ PalmCUnit-sections.ld > PalmCUnit.map 2>&1 ! # $(TESTINGOBJS): $(TESTDIR)/PalmCUnitRsc.h ! # PalmCUnit.ro: $(TESTDIR)/PalmCUnit.rcp ! # $(PILRC) -ro -allowEditID -H $(TESTDIR)/PalmCUnitRsc.h -q $(TESTDIR)/PalmCUnit.rcp PalmCUnit.ro ! # $(TESTDIR)/PalmCUnitRsc.h: $(TESTDIR)/PalmCUnit.rcp ! # $(PILRC) -ro -allowEditID -H $(TESTDIR)/PalmCUnitRsc.h -q $(TESTDIR)/PalmCUnit.rcp PalmCUnit.ro ! # PalmCUnit-sections.o: PalmCUnit-sections.s ! # $(CC) -c PalmCUnit-sections.s ! # PalmCUnit-sections.s PalmCUnit-sections.ld: $(TESTDIR)/PalmCUnit.def ! # $(MULTIGEN) $(TESTDIR)/PalmCUnit.def + # ## CUnit framework objs here + # PalmCUnit.o: $(TESTDIR)/PalmCUnit.c + # $(CC) $(CFLAGS) -c $< ! # TestSuite.o: $(TESTDIR)/TestSuite.c ! # $(CC) $(CFLAGS) -c $< ! # TaskTestSuite.o: $(TESTDIR)/TaskTestSuite.c ! # $(CC) $(CFLAGS) -c $< ! # SimpleDequeTestSuite.o: $(TESTDIR)/SimpleDequeTestSuite.c ! # $(CC) $(CFLAGS) -c $< ! # TestRun.o: $(TESTDIR)/TestRun.c ! # $(CC) $(CFLAGS) -c $< ! # TestDB.o: $(TESTDIR)/TestDB.c ! # $(CC) $(CFLAGS) -c $< ! # AssertImpl.o: $(TESTDIR)/AssertImpl.c ! # $(CC) $(CFLAGS) -c $< ! # Util.o: $(TESTDIR)/Util.c ! # $(CC) $(CFLAGS) -c $< + # # DO NOT DELETE ! # AddressDB.o: AddressDB.h Address.h linkaware.h progect.h progectRsc.h ! # aftersync.o: aftersync.h linkaware.h progect.h progectRsc.h ! # beam.o: beam.h ! # category.o: linkaware.h progect.h progectRsc.h ! # doc.o: doc.h linkaware.h progect.h progectRsc.h task.h ! # flat.o: flat.h linkaware.h progectdb.h progect.h progectRsc.h task.h xb.h ! # history.o: history.h linkaware.h progectdb.h progect.h ! # icon.o: icon.h linkaware.h MemoDB.h progect.h progectRsc.h task.h xb.h ! # linkaware.o: linkaware.h ! # link.o: AddressDB.h flat.h linkaware.h link.h MemoDB.h MemoMain.h progectdb.h ! # link.o: progect.h progectRsc.h task.h xb.h ! # MemoDB.o: linkaware.h MemoDB.h MemoMain.h progect.h progectRsc.h ! # progect_beam.o: AddressDB.h beam.h btm.h category.h doc.h flat.h icon.h ! # progect_beam.o: linkaware.h link.h MemoDB.h progectdb.h progect.h progectRsc.h ! # progect_beam.o: task.h ToDoDB.h ! # progectdb.o: history.h linkaware.h progectdb.h progect.h progectRsc.h task.h ! # progectdb.o: xb.h ! # progect.o: AddressDB.h aftersync.h beam.h btm.h category.h doc.h flat.h ! # progect.o: handera/Trg.h handera/Vga.h history.h icon.h linkaware.h link.h ! # progect.o: MemoDB.h progectdb.h progect.h progectRsc.h task.h ToDoDB.h xb.h ! # task.o: AddressDB.h linkaware.h MemoDB.h progectdb.h progect.h progectRsc.h ! # task.o: task.h ToDoDB.h xb.h ! # ToDoDB.o: linkaware.h progect.h progectRsc.h ToDoDB.h ToDo.h ! # xb.o: linkaware.h progect.h progectRsc.h task.h xb.h Index: Project.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/Project.cc,v retrieving revision 1.1.2.14 retrieving revision 1.1.2.15 diff -C2 -d -r1.1.2.14 -r1.1.2.15 *** Project.cc 28 Mar 2004 04:00:49 -0000 1.1.2.14 --- Project.cc 29 May 2004 02:32:26 -0000 1.1.2.15 *************** *** 161,165 **** // create the destination project error =createProject(newInfo); ! if (error.error()) return error; --- 161,165 ---- // create the destination project error =createProject(newInfo); ! if (error.stopExecution()) return error; *************** *** 167,176 **** Project createdProject(newInfo); error = createdProject.openProject(dmModeReadWrite); ! if (error.error()) return error; // open ourselves error = openProject(); ! if (error.error()) return error; --- 167,176 ---- Project createdProject(newInfo); error = createdProject.openProject(dmModeReadWrite); ! if (error.stopExecution()) return error; // open ourselves error = openProject(); ! if (error.stopExecution()) return error; Index: sections.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/sections.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** sections.h 14 Feb 2004 05:25:55 -0000 1.1.2.1 --- sections.h 29 May 2004 02:32:26 -0000 1.1.2.2 *************** *** 2,6 **** #define UISECT_H ! #define UISECT __attribute__ ((section ("uisect"))) #endif --- 2,9 ---- #define UISECT_H ! //#define UISECT __attribute__ ((section ("uisect"))) ! //#define PROJSECT __attribute__ ((section ("projsect"))) ! #define UISECT ! #define PROJSECT #endif Index: ProjectList.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectList.h,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -C2 -d -r1.1.2.10 -r1.1.2.11 *** ProjectList.h 26 Mar 2004 02:26:55 -0000 1.1.2.10 --- ProjectList.h 29 May 2004 02:32:26 -0000 1.1.2.11 *************** *** 32,43 **** #include "String.h" #include "PalmDBInfo.h" class ProjectList { public: ! ProjectList(); ! ~ProjectList(); ! ProjectGUI getRecord(UInt16 index); void updateProjectList(void) { --- 32,44 ---- #include "String.h" #include "PalmDBInfo.h" + #include "sections.h" class ProjectList { public: ! ProjectList() PROJSECT; ! ~ProjectList() PROJSECT; ! ProjectGUI getRecord(UInt16 index) PROJSECT; void updateProjectList(void) { *************** *** 53,62 **** friend class Project; ! void addProject(const PalmDBInfo &db); ! void renameProject(const PalmDBInfo &dbOld, const PalmDBInfo &dbNew); ! void deleteProject(const PalmDBInfo &db); ! UInt16 getProjectCategory(const PalmDBInfo &db); ! void setProjectCategory(const PalmDBInfo &db, UInt16 newCategory); static ProjectListDB *dbHandler; --- 54,63 ---- friend class Project; ! void addProject(const PalmDBInfo &db) PROJSECT; ! void renameProject(const PalmDBInfo &dbOld, const PalmDBInfo &dbNew) PROJSECT; ! void deleteProject(const PalmDBInfo &db) PROJSECT; ! UInt16 getProjectCategory(const PalmDBInfo &db) PROJSECT; ! void setProjectCategory(const PalmDBInfo &db, UInt16 newCategory) PROJSECT; static ProjectListDB *dbHandler; Index: FormManager.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/FormManager.h,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -C2 -d -r1.1.2.10 -r1.1.2.11 *** FormManager.h 27 Mar 2004 03:17:58 -0000 1.1.2.10 --- FormManager.h 29 May 2004 02:32:26 -0000 1.1.2.11 *************** *** 43,48 **** { public: ! FormManager( void ) UISECT; ! FormManager( const PalmForm& _rhs ) UISECT; ~FormManager( void ); --- 43,48 ---- { public: ! FormManager( void ); ! FormManager( const PalmForm& _rhs ); ~FormManager( void ); Index: ChooseNameForm.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/ChooseNameForm.cc,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** ChooseNameForm.cc 28 Mar 2004 04:00:49 -0000 1.1.2.3 --- ChooseNameForm.cc 29 May 2004 02:32:26 -0000 1.1.2.4 *************** *** 27,34 **** #include "progectRsc.h" #include "PalmDBInfo.h" #include "util.h" ! PalmDBInfo ShowChooseNameDialog(PalmDBInfo databaseInfo) { FormPtr frm; --- 27,35 ---- #include "progectRsc.h" #include "PalmDBInfo.h" + #include "Error.h" #include "util.h" ! Error ShowChooseNameDialog(PalmDBInfo databaseInfo) { FormPtr frm; *************** *** 36,45 **** FieldPtr nameField; Char *tempName=NULL; ! String returnValue = databaseInfo.getName(); frm=FrmInitForm(FrmChooseName); nameField=static_cast<FieldPtr>(GetObjectFromForm(frm,Fld_Project_Name)); ! SetFieldTextFromStr(nameField,returnValue,false); FrmDrawForm(frm); // have to do now to be compatible with pre-3.5 --- 37,46 ---- FieldPtr nameField; Char *tempName=NULL; ! Error returnValue; frm=FrmInitForm(FrmChooseName); nameField=static_cast<FieldPtr>(GetObjectFromForm(frm,Fld_Project_Name)); ! SetFieldTextFromStr(nameField,databaseInfo.getName(),false); FrmDrawForm(frm); // have to do now to be compatible with pre-3.5 *************** *** 59,74 **** // be aware that this can be an empty string, however that is still considered a cancel tempName=FldGetTextPtr(nameField); ! returnValue=tempName; ! break; ! /* ! case Btn_Choose_Name_Cancel: break; - */ } FrmDeleteForm(frm); ! // For now cardnumber is always zero, but in the future we will support putting projects on cards ! return PalmDBInfo(0, returnValue); } --- 60,76 ---- // be aware that this can be an empty string, however that is still considered a cancel tempName=FldGetTextPtr(nameField); ! // For now cardnumber is always zero, but in the future we ! // will support putting projects on cards ! databaseInfo=PalmDBInfo(0,tempName); ! databaseInfo=PalmDBInfo(0,"TestName"); ! break; ! default: ! returnValue.setCancelled(true); break; } FrmDeleteForm(frm); ! return returnValue; } |
Update of /cvsroot/progect/progect/CrackedLibrary In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7991/CrackedLibrary Added Files: Tag: OBJECT_INTERNALS_BRANCH __dummy.o __gcc_bcmp.o __main.o _ashldi3.o _ashrdi3.o _bb.o _clear_cache.o _cmpdi2.o _ctors.o _divdi3.o _divsi3.o _double.o _eh.o _eprintf.o _eqdf2.o _eqsf2.o _exit.o _ffsdi2.o _fixdfdi.o _fixsfdi.o _fixtfdi.o _fixunsdfdi.o _fixunsdfsi.o _fixunssfdi.o _fixunssfsi.o _fixunstfdi.o _fixunsxfdi.o _fixunsxfsi.o _fixxfdi.o _float.o _floatdidf.o _floatdisf.o _floatditf.o _floatdixf.o _floatex.o _gedf2.o _gesf2.o _gtdf2.o _gtsf2.o _ledf2.o _lesf2.o _lshrdi3.o _ltdf2.o _ltsf2.o _moddi3.o _modsi3.o _muldi3.o _mulsi3.o _nedf2.o _negdi2.o _nesf2.o _pure.o _shtab.o _trampoline.o _ucmpdi2.o _udiv_w_sdiv.o _udivdi3.o _udivmoddi4.o _udivsi3.o _umoddi3.o _umodsi3.o _varargs.o exception.o fpgnulib.o frame.o libgcc.a new.o opdel.o opdelnt.o opnew.o opnewnt.o opvdel.o opvdelnt.o opvnew.o opvnewnt.o tinfo.o tinfo2.o xfgnulib.o Log Message: This compiles, I'm not sure if it works correctly or not. --- NEW FILE: xfgnulib.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _ctors.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _eqdf2.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _divsi3.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _ltdf2.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _ledf2.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _float.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: __gcc_bcmp.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _lshrdi3.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _fixunstfdi.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _fixtfdi.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _eqsf2.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _udivmoddi4.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _varargs.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _divdi3.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _fixdfdi.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _udiv_w_sdiv.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _floatdisf.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _nedf2.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _gesf2.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _fixxfdi.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: libgcc.a --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _trampoline.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _clear_cache.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _cmpdi2.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _fixunsxfdi.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _umodsi3.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _fixunsxfsi.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _double.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _ashldi3.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: opvnewnt.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: opdelnt.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _bb.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: __main.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _shtab.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _pure.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _gedf2.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: opdel.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _floatdixf.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tinfo2.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _floatditf.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _eh.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _ltsf2.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _negdi2.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: opvdelnt.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _fixunssfsi.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _ashrdi3.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: opvdel.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _fixunssfdi.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _fixsfdi.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tinfo.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _exit.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _udivsi3.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _eprintf.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _modsi3.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _fixunsdfsi.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: opnewnt.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _gtsf2.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: frame.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _ucmpdi2.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: opnew.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: fpgnulib.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _fixunsdfdi.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _gtdf2.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _muldi3.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: new.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _floatex.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: opvnew.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _mulsi3.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _ffsdi2.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _udivdi3.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: __dummy.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: exception.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _floatdidf.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _umoddi3.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _lesf2.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _nesf2.o --- (This appears to be a binary file; contents omitted.) --- NEW FILE: _moddi3.o --- (This appears to be a binary file; contents omitted.) |
|
From: Rick P. <ric...@us...> - 2004-05-12 01:56:54
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31741 Modified Files: CHANGELOG Log Message: Getting ready for next release. Index: CHANGELOG =================================================================== RCS file: /cvsroot/progect/progect/CHANGELOG,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** CHANGELOG 12 May 2004 01:50:36 -0000 1.78 --- CHANGELOG 12 May 2004 01:56:45 -0000 1.79 *************** *** 1,2 **** --- 1,15 ---- + 2004-05-12 01:50 rick_price + + * CHANGELOG, Makefile, progect.h, progect.rcp: + + Getting ready for next release. + + 2004-04-25 19:21 bwinton + + * icon.c: + + Make the scroll bar in the icons selection page follow the stylus, + as per ST's suggestion. + 2004-04-13 15:43 bwinton |
|
From: Rick P. <ric...@us...> - 2004-05-12 01:50:46
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30842 Modified Files: CHANGELOG Makefile progect.h progect.rcp Log Message: Getting ready for next release. Index: CHANGELOG =================================================================== RCS file: /cvsroot/progect/progect/CHANGELOG,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** CHANGELOG 12 Apr 2004 18:22:59 -0000 1.77 --- CHANGELOG 12 May 2004 01:50:36 -0000 1.78 *************** *** 1,2 **** --- 1,16 ---- + 2004-04-13 15:43 bwinton + + * btm.h: + + Renumber the icons to avoid conflicts with user-supplied icon + packs. + + 2004-04-12 18:22 rick_price + + * CHANGELOG, Makefile, icon.c, icon.h, progect.c, progect.h, + progect.rcp: + + Merged in Blake's colour icon changes. Fixed a warning. + 2004-04-08 15:20 dannyzeng Index: Makefile =================================================================== RCS file: /cvsroot/progect/progect/Makefile,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** Makefile 12 Apr 2004 18:22:59 -0000 1.65 --- Makefile 12 May 2004 01:50:36 -0000 1.66 *************** *** 6,10 **** # owned by L. Burgbacher, the creator of Progect Manager APPID = "lbPG" ! REVISION = 0_30b4 TRANSLATIONS = de cs fr ja it sk ko zh es en --- 6,10 ---- # owned by L. Burgbacher, the creator of Progect Manager APPID = "lbPG" ! REVISION = 0_30b6 TRANSLATIONS = de cs fr ja it sk ko zh es en Index: progect.rcp =================================================================== RCS file: /cvsroot/progect/progect/progect.rcp,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** progect.rcp 12 Apr 2004 18:23:00 -0000 1.68 --- progect.rcp 12 May 2004 01:50:36 -0000 1.69 *************** *** 547,549 **** HEX "sKst" ID 1000 0x00 0x00 0x00 0x00 ! VERSION "0.30b4" --- 547,549 ---- HEX "sKst" ID 1000 0x00 0x00 0x00 0x00 ! VERSION "0.30b6" Index: progect.h =================================================================== RCS file: /cvsroot/progect/progect/progect.h,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** progect.h 12 Apr 2004 18:22:59 -0000 1.62 --- progect.h 12 May 2004 01:50:36 -0000 1.63 *************** *** 18,22 **** #define CREATOR 'lbPG' #define gPrepend "lbPG-" ! #define VERSION "0.30b4" #define DBVERSION 23 #define EXTENSION ".pgt" --- 18,22 ---- #define CREATOR 'lbPG' #define gPrepend "lbPG-" ! #define VERSION "0.30b6" #define DBVERSION 23 #define EXTENSION ".pgt" |
|
From: Blake W. <bw...@us...> - 2004-04-25 19:22:07
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30611 Modified Files: icon.c Log Message: Make the scroll bar in the icons selection page follow the stylus, as per ST's suggestion. Index: icon.c =================================================================== RCS file: /cvsroot/progect/progect/icon.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** icon.c 12 Apr 2004 18:22:59 -0000 1.14 --- icon.c 25 Apr 2004 19:21:42 -0000 1.15 *************** *** 269,273 **** case sclRepeatEvent: RedrawIconTable(e->data.sclRepeat.newValue); ! handled = true; break; --- 269,273 ---- case sclRepeatEvent: RedrawIconTable(e->data.sclRepeat.newValue); ! handled = false; break; |
|
From: Rick P. <ric...@us...> - 2004-04-22 03:38:28
|
Update of /cvsroot/progect/progect/CrackedLibrary In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11778/CrackedLibrary Log Message: Directory /cvsroot/progect/progect/CrackedLibrary added to the repository --> Using per-directory sticky tag `OBJECT_INTERNALS_BRANCH' |
|
From: Blake W. <bw...@us...> - 2004-04-13 15:57:08
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27005 Modified Files: btm.h Log Message: Renumber the icons to avoid conflicts with user-supplied icon packs. Index: btm.h =================================================================== RCS file: /cvsroot/progect/progect/btm.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** btm.h 4 Aug 2001 07:13:20 -0000 1.7 --- btm.h 13 Apr 2004 15:43:05 -0000 1.8 *************** *** 2,28 **** #define BtmNull 0 ! #define BtmOffset 1000 ! #define BtmPlusAlone 1000 ! #define BtmMinusAlone 1001 ! #define BtmItemChildNo 1002 ! #define BtmItemNo 1003 ! #define BtmItemChild 1004 ! #define BtmItemChildWrapped 1005 ! #define BtmItemChildNextWrapped 1006 ! #define BtmItemBottom 1007 ! #define BtmItemMiddle 1008 ! #define BtmItemFirst 1009 ! #define BtmItemAlone 1010 ! #define BtmItemAloneNoLine 1011 ! #define BtmLinkOn 1012 ! #define BtmLinkOff 1013 ! #define BtmLinkMaster 1014 ! #define BtmCheckedBox 1015 ! #define BtmIconIndent 1100 ! #define BtmIconFlat 1101 ! #define BtmIconIndentBig 2100 ! #define BtmIconFlatBig 2101 ! #define Icon_Indent 1000 ! #define Icon_Flat 1001 --- 2,28 ---- #define BtmNull 0 ! #define BtmOffset 9000 ! #define BtmPlusAlone 9000 ! #define BtmMinusAlone 9001 ! #define BtmItemChildNo 9002 ! #define BtmItemNo 9003 ! #define BtmItemChild 9004 ! #define BtmItemChildWrapped 9005 ! #define BtmItemChildNextWrapped 9006 ! #define BtmItemBottom 9007 ! #define BtmItemMiddle 9008 ! #define BtmItemFirst 9009 ! #define BtmItemAlone 9010 ! #define BtmItemAloneNoLine 9011 ! #define BtmLinkOn 9012 ! #define BtmLinkOff 9013 ! #define BtmLinkMaster 9014 ! #define BtmCheckedBox 9015 ! #define BtmIconIndent 9100 ! #define BtmIconFlat 9101 ! #define BtmIconIndentBig 9200 ! #define BtmIconFlatBig 9201 ! #define Icon_Indent 9000 ! #define Icon_Flat 9001 |
|
From: Rick P. <ric...@us...> - 2004-04-12 18:36:53
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17358 Modified Files: CHANGELOG Makefile icon.c icon.h progect.c progect.h progect.rcp Log Message: Merged in Blake's colour icon changes. Fixed a warning. Index: icon.h =================================================================== RCS file: /cvsroot/progect/progect/icon.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** icon.h 28 Sep 2000 13:26:04 -0000 1.1 --- icon.h 12 Apr 2004 18:22:59 -0000 1.2 *************** *** 14,27 **** #endif - #define MAX_ICONS 70 - - #define getIconImage(id) (loadedIcon[id].image) - #define getIconDesc(id) (loadedIcon[id].desc) #define getNumIconsLoaded() (numIconLoaded) ! #define getIconHeight(id) (8) ! #define getIconWidth(id) (8) ! #define getIconDataLength(id) (8) ! #define getIconRowBytes(id) (1) ! #define getIconColorDepth(id) (1) --- 14,20 ---- #endif #define getNumIconsLoaded() (numIconLoaded) ! #define getIconHeight(id) (10) ! #define getIconWidth(id) (9) *************** *** 31,51 **** // draw an icon specified by id, to (x, y). ! void drawIcon(UInt8 id, int x, int y); // event handler for icon select dialog. Boolean FrmIconSelectHandleEvent(EventPtr e); ! ///////////////////////////////////// ! // Internal use only. ! // don't direct access ! typedef struct tag_IconType { ! char shortcut; ! char desc[32]; ! UInt8 image[8]; ! } IconType; ! extern UInt8 numIconLoaded; ! extern IconType loadedIcon[MAX_ICONS]; ! #if defined(__cplusplus) --- 24,37 ---- // draw an icon specified by id, to (x, y). ! void drawIcon(UInt16 id, int x, int y); // event handler for icon select dialog. Boolean FrmIconSelectHandleEvent(EventPtr e); + extern UInt16 numIconLoaded; ! // terminate icon handling module. ! // please call at last. ! void terminateIcon(void); #if defined(__cplusplus) Index: progect.rcp =================================================================== RCS file: /cvsroot/progect/progect/progect.rcp,v retrieving revision 1.67 retrieving revision 1.68 diff -C2 -d -r1.67 -r1.68 *** progect.rcp 24 Mar 2004 02:02:14 -0000 1.67 --- progect.rcp 12 Apr 2004 18:23:00 -0000 1.68 *************** *** 486,490 **** BEGIN TITLE "Select icon" ! TABLE IconSelectTable at (1 15 150 121) ROWS 11 COLUMNS 2 COLUMNWIDTHS 75 75 SCROLLBAR Scr_SelectIcon at (PREVRIGHT+1 PREVTOP 7 121) BUTTON "OK" Btn_Ok at (6 140 auto auto) --- 486,490 ---- BEGIN TITLE "Select icon" ! TABLE IconSelectTable at (1 15 150 121) ROWS 11 COLUMNS 6 COLUMNWIDTHS 24 24 24 24 24 24 SCROLLBAR Scr_SelectIcon at (PREVRIGHT+1 PREVTOP 7 121) BUTTON "OK" Btn_Ok at (6 140 auto auto) *************** *** 547,549 **** HEX "sKst" ID 1000 0x00 0x00 0x00 0x00 ! VERSION "0.30b3" --- 547,549 ---- HEX "sKst" ID 1000 0x00 0x00 0x00 0x00 ! VERSION "0.30b4" Index: progect.h =================================================================== RCS file: /cvsroot/progect/progect/progect.h,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** progect.h 24 Mar 2004 02:02:14 -0000 1.61 --- progect.h 12 Apr 2004 18:22:59 -0000 1.62 *************** *** 18,22 **** #define CREATOR 'lbPG' #define gPrepend "lbPG-" ! #define VERSION "0.30b3" #define DBVERSION 23 #define EXTENSION ".pgt" --- 18,22 ---- #define CREATOR 'lbPG' #define gPrepend "lbPG-" ! #define VERSION "0.30b4" #define DBVERSION 23 #define EXTENSION ".pgt" Index: icon.c =================================================================== RCS file: /cvsroot/progect/progect/icon.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** icon.c 5 Feb 2004 04:03:00 -0000 1.13 --- icon.c 12 Apr 2004 18:22:59 -0000 1.14 *************** *** 14,22 **** #include "progectRsc.h" ! UInt8 numIconLoaded = 0; ! IconType loadedIcon[MAX_ICONS]; /**************************************************************************** --- 14,30 ---- #include "progectRsc.h" ! ///////////////////////////////////// ! // Internal use only. ! // don't direct access ! #define NO_ICON_INT -1 + static UInt16 maxIconCount; + UInt16 numIconLoaded = 0; + static DmOpenRef newIconDb; + typedef UInt16 IconType; + IconType* loadedIcons; + static void RedrawIconTable( UInt16 toprow ); /**************************************************************************** *************** *** 29,130 **** void initializeIcon(void) { ! DmOpenRef memodb; ! if (! MemoGetDatabase(&memodb, dmModeReadOnly)) { ! UInt16 i; ! UInt16 numRec = DmNumRecords(memodb); ! for (i = 0; i < numRec; i++) { ! MemHandle h; ! MemoDBRecordType *rcd; ! ! UInt16 attr; ! // get the memo's attr ! DmRecordInfo(memodb, i, &attr, NULL, NULL); ! // if it's not deleted ! if (attr & dmRecAttrDelete) ! continue; ! ! h = DmQueryRecord(memodb, i); ! if (!h) ! continue; ! ! rcd = MemHandleLock(h); ! ! ! if ((! StrNCompare(&rcd->note, "DATEBK3\n", 8)) || (! StrNCompare(&rcd->note, "ALTDATEBK3\n", 8))) ! { ! UInt8* p = (UInt8*)(&rcd->note) + 8; ! while (*p) ! { ! UInt16 n; ! if (*p != '#') ! { // skip invalid line ! while (*p && *p != '\n') ! p++; ! if (! *p) break; ! p++; ! continue; ! } ! ! // copy and skip description ! // NOTE: 1st char is shortcut. ! p++; ! loadedIcon[numIconLoaded].shortcut = *p++; ! for (n = 0; *p && *p != '\n' && *p != '=' && n < 31; n++) ! loadedIcon[numIconLoaded].desc[n] = *p++; ! loadedIcon[numIconLoaded].desc[n] = '\0'; ! ! if (*p == '=') ! { // copy image ! p++; ! for (n = 0; n < 8; n++) ! { ! UInt8 bits; ! // load higher 4 bits ! if (*p >= '0' && *p <= '9') ! bits = *p - '0'; ! else if (*p >= 'a' && *p <= 'f') ! bits = *p - 'a' + 10; ! else if (*p >= 'A' && *p <= 'F') ! bits = *p - 'A' + 10; ! else ! break; // found invalid character ! p++; ! ! // load lower 4 bits ! bits <<= 4; ! if (*p >= '0' && *p <= '9') ! bits += *p - '0'; ! else if (*p >= 'a' && *p <= 'f') ! bits += *p - 'a' + 10; ! else if (*p >= 'A' && *p <= 'F') ! bits += *p - 'A' + 10; ! else ! break; // found invalid character ! p++; ! ! loadedIcon[numIconLoaded].image[n] = bits; ! } ! if (n == 8) // all succeded ! { ! if (++numIconLoaded >= MAX_ICONS) ! break; ! } ! } ! while (*p && *p != '\n') // skip junk ! p++; ! if (*p == '\n') p++; ! } ! MemHandleUnlock(h); ! break; ! } ! MemHandleUnlock(h); } ! DmCloseDatabase(memodb); } } // void initializeIcon(void) --- 37,76 ---- void initializeIcon(void) { ! UInt32 type; ! Int32 creator; ! UInt16 dmIndex = 0; ! Err err = 0; ! const LocalID lid = DmFindDatabase( 0, "Default Progect Icons" ); ! ! if ( lid ) { ! // Double check the type and creator. ! DmDatabaseInfo( 0, lid, 0, 0, 0, 0, 0, 0, 0, 0, 0, &type, &creator ); ! if ( 'Rsrc' == type && 'Actn' == creator ) { ! newIconDb = DmOpenDatabase( 0, lid, dmModeReadOnly ); ! } ! } ! if ( newIconDb == NULL ) ! { ! newIconDb = DmOpenDatabaseByTypeCreator('Rsrc', 'Actn', dmModeReadOnly); } ! if ( newIconDb != NULL ) ! { ! dmIndex = 0; ! maxIconCount = DmNumResources( newIconDb ); ! loadedIcons = (IconType*)MemPtrNew( maxIconCount * sizeof(IconType) ); ! dmIndex = DmFindResourceType( newIconDb, bitmapRsc, numIconLoaded ); ! while ( dmIndex != 0xFFFF && numIconLoaded < maxIconCount ) ! { ! err = DmResourceInfo( newIconDb, dmIndex, ! NULL, &(loadedIcons[numIconLoaded]), NULL ); ! numIconLoaded++; ! dmIndex = DmFindResourceType( newIconDb, 'Tbmp', numIconLoaded ); } ! return; } } // void initializeIcon(void) *************** *** 132,135 **** --- 78,98 ---- + /**************************************************************************** + * Name : terminateIcon + * Desc : unload and terminate icon + * Parm : + * Out : + * Auth : bwinton, 23.09.2000 JST + ***************************************************************************/ + void terminateIcon(void) + { + if ( newIconDb != NULL ) + { + MemPtrFree( loadedIcons ); + DmCloseDatabase( newIconDb ); + loadedIcons = NULL; + newIconDb = NULL; + } + } // void terminateIcon(void) *************** *** 143,186 **** * Auth : seagull, 25.09.2000 JST ***************************************************************************/ ! void drawIcon(UInt8 id, int x, int y) { ! if (id >= getNumIconsLoaded()) ! return ; ! // currently MONO image only. ! if (OSCaps.ver35) { ! UInt16 err; ! UInt8 n; ! ! BitmapType* bmp = BmpCreate(getIconWidth(id), getIconHeight(id), ! getIconColorDepth(id), NULL, &err); ! UInt16* dstbits = BmpGetBits(bmp); ! UInt8* srcbits = getIconImage(id); ! for (n = 0; n < getIconDataLength(id); n++) ! *(dstbits++) = *(srcbits++) << 8; ! ! WinDrawBitmap(bmp, x, y); ! BmpDelete(bmp); ! } ! else ! { ! UInt8 *srcbits = getIconImage(id); ! RectangleType pixel; ! UInt8 n, i; ! for (n = 0; n < 8; n++) ! { ! for (i = 0; i < 8; i++) ! { ! if (srcbits[n] & 1 << (7 - i)) ! { ! RctSetRectangle(&pixel, x + i, y + n, 1, 1); ! WinDrawRectangle(&pixel, 0); ! } ! } ! } } ! } // void DrawIcon(UInt8 id, int x, int y) --- 106,128 ---- * Auth : seagull, 25.09.2000 JST ***************************************************************************/ ! void drawIcon(UInt16 id, int x, int y) { ! UInt16 iconId; ! MemHandle bmpHandle; ! BitmapPtr bmp; ! iconId = id; ! bmpHandle = DmGetResource( bitmapRsc, iconId ); ! if ( bmpHandle != NULL ) { ! bmp = (BitmapPtr)MemHandleLock( bmpHandle ); ! WinDrawBitmap( bmp, x, y ); ! MemHandleUnlock( bmpHandle ); ! DmReleaseResource( bmpHandle ); } ! return; ! ! } // void DrawIcon(UInt16 id, int x, int y) *************** *** 209,228 **** { UInt16 id = TblGetItemInt(tableP, row, column); - if (id >= getNumIconsLoaded()) - return ; - // erase the row ! if (!OSCaps.ver35) ! { ! WinEraseRectangle(bounds, 0); ! } ! drawIcon(id, bounds->topLeft.x, bounds->topLeft.y); ! FntSetFont(stdFont); ! DrawTruncText(getIconDesc(id), ! bounds->topLeft.x + getIconWidth(id) + 1, ! bounds->topLeft.y, ! bounds->extent.x - getIconWidth(id) - 1); } --- 151,165 ---- { UInt16 id = TblGetItemInt(tableP, row, column); + Int16 x,y; // erase the row ! WinEraseRectangle(bounds, 0); ! x = bounds->topLeft.x; ! y = bounds->topLeft.y; ! x += (bounds->extent.x - getIconWidth(id))/2; ! y += (bounds->extent.y - getIconHeight(id))/2; ! ! drawIcon(id, x, y); } *************** *** 248,274 **** TablePtr table = GetObjectPtr(IconSelectTable); ! int i; ! int item = toprow * 2; ! int rows = TblGetNumberOfRows(table); ! for (i = 0; i < rows; i++) { ! TblSetItemInt(table, i, 0, item++); ! TblSetItemStyle(table, i, 0, customTableItem); ! ! TblSetItemInt(table, i, 1, item++); ! TblSetItemStyle(table, i, 1, customTableItem); ! ! TblSetRowSelectable(table, i, true); } - TblSetColumnUsable(table, 0, true); - TblSetColumnUsable(table, 1, true); - TblSetCustomDrawProcedure(table, 0, onDrawIconColumn); - TblSetCustomDrawProcedure(table, 1, onDrawIconColumn); TblHasScrollBar(table, true); SclSetScrollBar(GetObjectPtr(Scr_SelectIcon), toprow, ! 0, (getNumIconsLoaded() + 1) / 2 - 11, rows); TblDrawTable(table); SclDrawScrollBar(GetObjectPtr(Scr_SelectIcon) ); --- 185,235 ---- TablePtr table = GetObjectPtr(IconSelectTable); ! Int16 i; ! Int16 totalRows; ! Int16 rows = TblGetNumberOfRows(table); ! Int16 columns = TblGetNumberOfColumns(table); ! for (i = 0; i < columns; i++) { ! TblSetColumnUsable(table, i, true); ! TblSetCustomDrawProcedure(table, i, onDrawIconColumn); } TblHasScrollBar(table, true); + totalRows = (getNumIconsLoaded()/columns); + totalRows = totalRows - rows + 1; SclSetScrollBar(GetObjectPtr(Scr_SelectIcon), toprow, ! 0, totalRows<0?0:totalRows, rows-1); ! ! RedrawIconTable( toprow ); ! } ! ! ! static void RedrawIconTable( UInt16 toprow ) ! { ! TablePtr table = GetObjectPtr(IconSelectTable); + Int16 i,j,itemInt; + Int16 rows = TblGetNumberOfRows(table); + Int16 columns = TblGetNumberOfColumns(table); + Int16 item = toprow * columns; + for (i = 0; i < rows; i++) + { + for (j = 0; j < columns; j++) + { + if ( item >= getNumIconsLoaded() ) + { + itemInt = (Int16)NO_ICON_INT; + } + else + { + itemInt = loadedIcons[item]; + } + item++; + TblSetItemInt(table, i, j, itemInt); + TblSetItemStyle(table, i, j, customTableItem); + } + TblSetRowSelectable(table, i, true); + } TblDrawTable(table); SclDrawScrollBar(GetObjectPtr(Scr_SelectIcon) ); *************** *** 279,284 **** - - /**************************************************************************** * Name : FrmIconSelectHandleEvent --- 240,243 ---- *************** *** 291,295 **** --- 250,257 ---- Boolean FrmIconSelectHandleEvent (EventPtr e) { + Boolean handled = false; FormPtr frm; + UInt16 temp = NO_ICON_INT; + ScrollBarPtr scrl = NULL; TablePtr table; *************** *** 302,310 **** FrmDrawForm(frm); UpdateIconTable(0); ! return true; case sclRepeatEvent: ! UpdateIconTable(e->data.sclRepeat.newValue); ! return true; case ctlSelectEvent: --- 264,274 ---- FrmDrawForm(frm); UpdateIconTable(0); ! handled = true; ! break; case sclRepeatEvent: ! RedrawIconTable(e->data.sclRepeat.newValue); ! handled = true; ! break; case ctlSelectEvent: *************** *** 330,342 **** FrmUpdateForm(FrmTaskEdit, frmTaskEditReturnFromIconSelect); FrmReturnToForm(0); ! return true; case tblSelectEvent: ! if (TblGetItemInt(e->data.tblSelect.pTable, ! e->data.tblSelect.row, e->data.tblSelect.column) ! >= getNumIconsLoaded()) { TblUnhighlightSelection(e->data.tblSelect.pTable); ! return true; } break; --- 294,307 ---- FrmUpdateForm(FrmTaskEdit, frmTaskEditReturnFromIconSelect); FrmReturnToForm(0); ! handled = true; ! break; case tblSelectEvent: ! temp = TblGetItemInt(e->data.tblSelect.pTable, ! e->data.tblSelect.row, e->data.tblSelect.column); ! if ( temp == NO_ICON_INT ) { TblUnhighlightSelection(e->data.tblSelect.pTable); ! handled = true; } break; *************** *** 346,351 **** e->data.keyDown.chr == vchrPageUp) { - ScrollBarPtr scrl = GetObjectPtr(Scr_SelectIcon); Int16 curr, min, max, page, newpos; SclGetScrollBar(scrl, &curr, &min, &max, &page); newpos = (e->data.keyDown.chr == vchrPageDown)? --- 311,316 ---- e->data.keyDown.chr == vchrPageUp) { Int16 curr, min, max, page, newpos; + scrl = GetObjectPtr(Scr_SelectIcon); SclGetScrollBar(scrl, &curr, &min, &max, &page); newpos = (e->data.keyDown.chr == vchrPageDown)? *************** *** 355,362 **** if (newpos != curr) UpdateIconTable(newpos); } default: break; } ! return false; } // static Boolean FrmMainHandleEvent (EventPtr e) --- 320,331 ---- if (newpos != curr) UpdateIconTable(newpos); } + handled = true; + break; default: + scrl = GetObjectPtr(Scr_SelectIcon); + handled = SclHandleEvent( scrl, e ); break; } ! return handled; } // static Boolean FrmMainHandleEvent (EventPtr e) Index: progect.c =================================================================== RCS file: /cvsroot/progect/progect/progect.c,v retrieving revision 1.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** progect.c 24 Mar 2004 02:02:14 -0000 1.90 --- progect.c 12 Apr 2004 18:22:59 -0000 1.91 *************** *** 593,598 **** if (pgOK == TaskGetExtraChunkByTaskPtr(p, Extra_Icon, 0, &iconid, &size) && ! size == sizeof(iconid) && ! iconid < getNumIconsLoaded() ) { drawIcon(iconid, x, y); --- 593,597 ---- if (pgOK == TaskGetExtraChunkByTaskPtr(p, Extra_Icon, 0, &iconid, &size) && ! size == sizeof(iconid) ) { drawIcon(iconid, x, y); *************** *** 761,766 **** Extra_Icon, 0, &iconid, &size) && ! size == sizeof(iconid) && ! iconid < getNumIconsLoaded() ) { drawIcon(iconid, x + leftIndentText, y + 6 - getIconHeight(iconid) / 2); --- 760,764 ---- Extra_Icon, 0, &iconid, &size) && ! size == sizeof(iconid) ) { drawIcon(iconid, x + leftIndentText, y + 6 - getIconHeight(iconid) / 2); *************** *** 2945,2950 **** if (!TaskGetExtraChunk(gdbP, gActualTask, Extra_Icon, 0, &iconid, &size) && ! size == sizeof(iconid) && ! iconid < getNumIconsLoaded() ) { Coord x, y; --- 2943,2947 ---- if (!TaskGetExtraChunk(gdbP, gActualTask, Extra_Icon, 0, &iconid, &size) && ! size == sizeof(iconid) ) { Coord x, y; *************** *** 4970,4973 **** --- 4967,4972 ---- } + terminateIcon(); + // clear the clipboard NewClipboard(); Index: CHANGELOG =================================================================== RCS file: /cvsroot/progect/progect/CHANGELOG,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** CHANGELOG 24 Mar 2004 02:02:14 -0000 1.76 --- CHANGELOG 12 Apr 2004 18:22:59 -0000 1.77 *************** *** 1,2 **** --- 1,243 ---- + 2004-04-08 15:20 dannyzeng + + * Makefile: + + use -Fg option of pilrc for Chinese build. Need patched pilrc 3.0 + by Danny Zeng. + + 2004-04-08 15:18 dannyzeng + + * zh.rcp.source: + + Corrected comment format error. Corrected some mis-translation. - + Danny Zeng + + 2004-04-08 15:15 dannyzeng + + * zh.rcp: + + Corrected format error in Chinese translation. - Danny Zeng + + 2004-03-28 04:00 rick_price + + * ChooseNameForm.cc, Project.cc, Project.h, ProjectGUI.cc, + ProjectGUI.h, ProjectList.cc, String.cc, progect.rcp, progectRsc.h: + + Various bug fixes, still need to handle cancel from project name + dialog correctly, currently it's ignored. + + 2004-03-28 03:08 rick_price + + * Error.cc, Error.h, Project.cc, ProjectGUI.cc, ProjectGUI.h, + ProjectListForm.cc, ProjectListForm.h, String.cc, String.h, + TableHandler.h, progect.rcp, progectRsc.h: + + Improved error handling, particularly in ProjectListForm where the + error is handled for all items in two places instead of in each + function. + + 2004-03-28 02:29 rick_price + + * ProjectList.cc: + + Fixed an off by one error that I introduced last time. + + 2004-03-27 13:46 rick_price + + * String.cc, String.h: + + Removed some redunancy in String, untested. + + 2004-03-27 13:38 rick_price + + * String.cc, String.h: + + String can now load resource strings, untested. + + 2004-03-27 13:37 rick_price + + * ProjectListForm.cc: + + Style formatting change. + + 2004-03-27 04:15 rick_price + + * PalmForm.h: + + Moved another class to UISECT with no obvious ill effects, still + have no real idea what was wrong with the other code I moved into + UISECT. + + 2004-03-27 03:42 rick_price + + * Project.cc, ProjectList.cc, ProjectListForm.cc, progect.rcp, + progectRsc.h: + + Fixed a problem in ProjectList.cc where it was not properly copying + the renamed project name. Added code so that if someone asked + Progect to do something that required a selection, and nothing was + selected, it would complain with an error window. + + 2004-03-27 03:17 rick_price + + * FormManager.cc, FormManager.h, PalmForm.cc: + + Fixed some problems caused by the movement of stuff into sections. + Evidently the main application needs to call a function in the main + segment, but the other calls worked out just fine. I don't + understand why this is so, but the code seems to work now. + + 2004-03-27 02:24 rick_price + + * PalmForm.cc, ProjectListForm.cc: + + Buttons should now be handled in the ProjecListForm. None of this + new code is tested at all. + + 2004-03-27 01:16 rick_price + + * FormManager.h, Project.cc, Project.h, ProjectGUI.cc: + + Project::renameProject should now be finished. Had to move some + stuff to the UISECT because we ran out of space. + + 2004-03-26 21:44 rick_price + + * Error.h, Project.cc, Project.h, progectRsc.h: + + Modified how Error works a bit, in particular, it doesn't take a + string argument anymore, but a resource ID for the string in the + resource database that represents the error. Glad I caught that one + when I did... + + The project class now renames as well as deletes. + + 2004-03-26 02:26 rick_price + + * Error.cc, Error.h, Project.cc, Project.h, ProjectGUI.cc, + ProjectGUI.h, ProjectList.cc, ProjectList.h, ProjectListDB.cc, + ProjectListDB.h, ProjectListForm.h, ProjectListRS.cc, + ProjectListRS.h: + + Did a make style, that accounts for almost every file in the list. + + Changed ProjectList so that it keeps a reference counted + ProjectListDB object around, and uses the object as a handler. This + is so that we can create a ProjectList whenever we need to to + access the project list without colliding on the open database + call. This accounts for the ProjectList* files. + + This code is untested, but should work. + + 2004-03-25 23:07 rick_price + + * Error.cc, Error.h, Makefile, PalmDBInfo.cc, PalmDBInfo.h, + Project.cc, Project.h, ProjectGUI.cc, ProjectGUI.h, + ProjectListForm.h, progect.h: + + Now able to actually create a database file, however it won't be + compatible with Progect yet, because it doesn't create the initial + task which seems to be required, at least from the documentation in + the code. It will probably also have some failure with trying to + update the list of projects on the Palm automatically, I need to + deal with this yet. + + 2004-03-25 04:22 rick_price + + * ChooseNameForm.cc: + + Fixed problem with case of util.h, now compiles on Linux. + + 2004-03-25 03:54 rick_price + + * PalmDBInfo.h, Project.h, ProjectGUI.cc, ProjectGUI.h: + + Make ProjectGUI a bit more functional, next step is probably to + start actually creating databases etc in "Project". + + 2004-03-25 03:10 rick_price + + * ChooseNameForm.cc, ChooseNameForm.h, Makefile, PalmDBInfo.cc, + PalmDBInfo.h, Project.cc, Project.h, ProjectGUI.cc, ProjectGUI.h, + ProjectList.cc, ProjectList.h, String.h, util.cc, util.h: + + Starting to setup GUI code to ask for new filename. Currently + working on being able to create new projects. The choose name + dialog is now setup, I just left it pretty much unchanged from the + old Progect for now because there didn't seem to be any good reason + to change it at this point. Because Palm wants to use a name and + cardnumber to identify projects, we now have a class called + PalmDBInfo.h that essentially puts those two things together. I + have modified probably all the classes that need to be modified to + make use of this new class. This code isn't really tested, but + POSE seems happy enough with it so far. + + 2004-03-24 18:59 rick_price + + * Docs/NewReleaseNotificationList.doc: + + Made some minor changes to the notification list. + + 2004-03-24 05:10 rick_price + + * Project.cc, Project.h, ProjectGUI.h, ProjectListRS.cc, String.cc: + + Moved the testing for menu selections into ProjectGUI. Implemented + drawing in ProjectListRS.cc again. Fixed a hard to find bug in + String where the string pointer was being nulled in the first + constructor, and thereby causing memory leaks. + + 2004-03-24 02:02 rick_price + + * CHANGELOG, Makefile, progect.c, progect.h, progect.rcp: + + Fixed a overflow error in the numeric type when it calculated + *doneness*. + + 2004-03-20 19:52 rick_price + + * ProgectApplication.cc, Project.cc, ProjectGUI.cc, ProjectGUI.h, + ProjectList.cc, ProjectList.h, ProjectListDB.h, ProjectListForm.cc, + ProjectListForm.h, ProjectListRS.cc, ProjectListRS.h, String.cc, + String.h: + + Did a "make style". Started to do a bit more implementation in + ProjectListForm.h so that the class calls out to the *Project* to + make it do things like rename, delete etc. + + 2004-03-20 15:38 rick_price + + * Makefile, ProgectApplication.cc, Project.cc, Project.h, + ProjectGUI.cc, ProjectGUI.h, ProjectList.cc, ProjectList.h, + ProjectListDB.cc, ProjectListDB.h, ProjectListForm.cc, + ProjectListForm.h, ProjectListRS.cc, ProjectListRS.h, + TableHandler.h, progect.h, util.cc, util.h: + + The ProjectList Form and related code is almost ready to go, I + still need to finish some changes to the ProjectListRecordSource, + and I have not actually run this code, however it compiles. To + move forward, I need to finish the changes to the record source, + and start to implement the GUI functions for a project IE ask user + for new project name. + + 2004-03-20 05:14 rick_price + + * String.h: + + Added conversion from String to const Char * const (can't change + pointer, can't change pointee). + + 2004-03-20 04:47 rick_price + + * Project.cc, Project.h, String.cc, String.h: + + Latest changes to String and Project classes. + + 2004-03-20 04:36 rick_price + + * String.cc, String.h: + + Adding string class. + 2004-03-19 03:06 rick_price Index: Makefile =================================================================== RCS file: /cvsroot/progect/progect/Makefile,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** Makefile 8 Apr 2004 15:20:32 -0000 1.64 --- Makefile 12 Apr 2004 18:22:59 -0000 1.65 *************** *** 6,10 **** # owned by L. Burgbacher, the creator of Progect Manager APPID = "lbPG" ! REVISION = 0_30b3 TRANSLATIONS = de cs fr ja it sk ko zh es en --- 6,10 ---- # owned by L. Burgbacher, the creator of Progect Manager APPID = "lbPG" ! REVISION = 0_30b4 TRANSLATIONS = de cs fr ja it sk ko zh es en |
|
From: Danny Z. <dan...@us...> - 2004-04-08 15:33:41
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1631 Modified Files: Makefile Log Message: use -Fg option of pilrc for Chinese build. Need patched pilrc 3.0 by Danny Zeng. Index: Makefile =================================================================== RCS file: /cvsroot/progect/progect/Makefile,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** Makefile 24 Mar 2004 02:02:14 -0000 1.63 --- Makefile 8 Apr 2004 15:20:32 -0000 1.64 *************** *** 149,153 **** progect-zh.ro: $(TARGET).rcp zh.rcp cat zh.rcp $(TARGET).rcp >progect-zh.rcp ! $(PILRC) -ro -L BIG5 -F5 progect-zh.rcp progect-es.ro: $(TARGET).rcp es.rcp --- 149,153 ---- progect-zh.ro: $(TARGET).rcp zh.rcp cat zh.rcp $(TARGET).rcp >progect-zh.rcp ! $(PILRC) -ro -L zhGB -Fg progect-zh.rcp progect-es.ro: $(TARGET).rcp es.rcp |
|
From: Danny Z. <dan...@us...> - 2004-04-08 15:31:26
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1099 Modified Files: zh.rcp.source Log Message: Corrected comment format error. Corrected some mis-translation. - Danny Zeng Index: zh.rcp.source =================================================================== RCS file: /cvsroot/progect/progect/zh.rcp.source,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** zh.rcp.source 26 Jan 2004 17:51:04 -0000 1.2 --- zh.rcp.source 8 Apr 2004 15:18:10 -0000 1.3 *************** *** 1,4 **** --- 1,5 ---- // Simplification Chinese (GB2312 Code) translation resource file Ver. 1.0(20031222) // Translated by Raylex Zhang (Ra...@21...) + // Last Translated by Danny Zeng (dan...@us...) on March 28, 2004 TRANSLATION "zhGB" *************** *** 16,20 **** #//////////////////////////////// ! >//FORM FrmFlatFilter 2 2 156 156 Flat Filter Details ƽÃæ¹ýÂËÆ÷Ïêϸ×ÊÁÏ --- 17,21 ---- #//////////////////////////////// ! #//FORM FrmFlatFilter 2 2 156 156 Flat Filter Details ƽÃæ¹ýÂËÆ÷Ïêϸ×ÊÁÏ *************** *** 58,63 **** ÈÕÆÚ - #//No - Sort: ÅÅÐò --- 59,62 ---- *************** *** 300,304 **** ToDo Link: ! ToDo Link: Category: --- 299,303 ---- ToDo Link: ! ´ý°ìÊÂÏîÁ´½Ó: Category: *************** *** 313,317 **** Parents ! Parents #////////////////////////////////////////////// --- 312,316 ---- Parents ! Éϼ¶ #////////////////////////////////////////////// *************** *** 346,350 **** Graffiti Help ! Graffiti°ïÖú #////////////////////////////////////////// --- 345,349 ---- Graffiti Help ! ÊÖд°ïÖú #////////////////////////////////////////// *************** *** 418,422 **** Maintainer ric...@us...\n ! Maintainer ric...@us...\n Mailing List http://groups.yahoo.com/group/progect --- 417,421 ---- Maintainer ric...@us...\n ! ά»¤Õß ric...@us...\n Mailing List http://groups.yahoo.com/group/progect *************** *** 506,513 **** #//FORM FrmMemoExportProperties 2 2 156 156 Export to MemoPad/Doc ! Êä³öµ½MemoPad/Doc Please select export options: ! ÇëÑ¡ÔñÊä³öÑ¡Ïî: Done tasks: --- 505,512 ---- #//FORM FrmMemoExportProperties 2 2 156 156 Export to MemoPad/Doc ! µ¼³öµ½ ¼Çʱ¾/Doc Please select export options: ! ÇëÑ¡Ôñµ¼³öÑ¡Ïî: Done tasks: *************** *** 536,540 **** RAW TEXT ! RAW TEXT HTML <H1> --- 535,539 ---- RAW TEXT ! ÔÎı¾ HTML <H1> *************** *** 548,552 **** Memo ! ±¸Íü¼ DOC --- 547,552 ---- Memo ! ¼Çʱ¾ ! DOC *************** *** 568,572 **** ToDo Unlink: ! ToDo Unlink: #//ToDo Link: --- 568,572 ---- ToDo Unlink: ! È¡Ïû´ý°ìÊÂÏîÁ´½Ó: #//ToDo Link: *************** *** 593,597 **** Strike done tasks: ! Strike done tasks: Hide done progress: --- 593,597 ---- Strike done tasks: ! »®µôÒÑÍê³ÉÈÎÎñ: Hide done progress: *************** *** 631,635 **** Actual Subview ! ¸±ÊÓͼ #///////////////////////////////////////// --- 631,635 ---- Actual Subview ! µ±Ç°×ÓÊÓͼ #///////////////////////////////////////// *************** *** 647,651 **** Toggle ! Toggle #////////////////////////////////// --- 647,651 ---- Toggle ! Çл» #////////////////////////////////// *************** *** 655,665 **** all tasks ! ËùÒÔÈÎÎñ all tasks in this subview ! ËùÓи±ÊÓͼÖеÄÈÎÎñ all children of this selected task ! Ñ¡Ôñ±¾ÈÎÎñϵÄËùÓÐ×ÓÈÎÎñ this task and all its children --- 655,665 ---- all tasks ! ËùÓÐÈÎÎñ all tasks in this subview ! ±¾×ÓÊÓͼÖеÄËùÓÐÈÎÎñ all children of this selected task ! ´ËÑ¡ÖÐÈÎÎñϵÄËùÓÐ×ÓÈÎÎñ this task and all its children *************** *** 670,683 **** all done tasks in this view ! ËùÓÐÔÚÊÓͼÖÐÒÑÍê³ÉµÄÈÎÎñ You must first select a task to do this. ! Äã±ØÐëÏÈÑ¡ÔñÒ»¸öÈÎÎñ²ÅÄܼÌÐø. LinkMaster is not available. ! LinkMaster²»¿ÉÓÃ(²»´æÔÚ). LinkInfo not found. ! ÕÒ²»µ½Á´½ÓÐÅÏ¢(LinkInfo). Not enough memory for this operation --- 670,683 ---- all done tasks in this view ! ´ËÊÓͼÖÐËùÓÐÒÑÍê³ÉµÄÈÎÎñ You must first select a task to do this. ! Äã±ØÐëÏÈÑ¡ÔñÒ»¸öÈÎÎñ²ÅÄÜ×ö´Ë²Ù×÷. LinkMaster is not available. ! LinkMaster²»´æÔÚ. LinkInfo not found. ! ÕÒ²»µ½ LinkInfo. Not enough memory for this operation *************** *** 690,697 **** DOC already exists. Please delete it before export. ! DOCÎĵµÒÑ´æÔÚ.ÇëÔÚµ¼³öǰɾ³ýËü. Your project preferences have been deleted, please go to the preference menu and set them. ! ÄãµÄÏîÄ¿ÉèÖÃÒѱ»É¾³ý,Çë½øÈëÉèÖò˵¥ÖØÐÂÉèÖÃÃ. #//delete --- 690,697 ---- DOC already exists. Please delete it before export. ! DOCÎĵµÒÑ´æÔÚ. ÇëÔÚµ¼³öǰɾ³ýËü. Your project preferences have been deleted, please go to the preference menu and set them. ! ÄãµÄÏîÄ¿ÉèÖÃÒѱ»É¾³ý, Çë½øÈëÉèÖò˵¥ÖØÐÂÉèÖᣠ#//delete *************** *** 701,708 **** modify ! ±à¼ This link was not valid anymore, it has been deleted. ! ´ËÁ´½Ó²»´æÔÚ,¿ÉÄÜÒѱ»É¾³ý. Edit categories... --- 701,708 ---- modify ! ÐÞ¸Ä This link was not valid anymore, it has been deleted. ! ´ËÁ´½Ó²»ÔÙÓÐЧ£¬Òѱ»É¾³ý. Edit categories... |
|
From: Danny Z. <dan...@us...> - 2004-04-08 15:28:25
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32738 Modified Files: zh.rcp Log Message: Corrected format error in Chinese translation. - Danny Zeng Index: zh.rcp =================================================================== RCS file: /cvsroot/progect/progect/zh.rcp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** zh.rcp 26 Jan 2004 17:51:04 -0000 1.4 --- zh.rcp 8 Apr 2004 15:15:01 -0000 1.5 *************** *** 1,4 **** --- 1,5 ---- // Simplification Chinese (GB2312 Code) translation resource file Ver. 1.0(20031222) // Translated by Raylex Zhang (Ra...@21...) + // Last Translated by Danny Zeng (dan...@us...) on March 28, 2004 TRANSLATION "zhGB" *************** *** 10,44 **** "Up" = "Éϼ¶" "@#$CMT$#@"="////////////////////////////////" ! ">//FORM FrmFlatFilter 2 2 156 156" = "Flat Filter Details" ! "ƽÃæ¹ýÂËÆ÷Ïêϸ×ÊÁÏ" = "Only" ! "½ö" = "Min" ! "×îС" = "No" ! "·ñ" = "Priority:" ! "ÓÅÏȼ¶:" = "OR" ! "»ò" = "AND" ! "Óë" = "All" ! "@#$CMT$#@"="//No" ! "È«²¿" = "Yes" ! "ÊÇ" = "Dated Tasks:" ! "¹ýÆÚµÄÈÎÎñ:" = "Date in limit:" ! "ÏÞ¶¨ÈÕÆÚ:" = "Priority" ! "ÓÅÏȼ¶" = "Date" "@#$CMT$#@"="//No" ! "ÈÕÆÚ" = "Sort:" ! "ÅÅÐò" = "None" ! "ÎÞ" = "Overdue" ! "ÒѹýÆÚ" = "Today" ! "½ñÌì" = "2 days" ! "2 Ìì" = "3 days" ! "3 Ìì" = "4 days" ! "4 Ìì" = "5 days" ! "5 Ìì" = "6 days" ! "6 Ìì" = "1 week" ! "1 ÖÜ" = "2 weeks" ! "2 ÖÜ" = "3 weeks" ! "3 ÖÜ" = "4 weeks" ! "4 ÖÜ" = "OK" ! "È·¶¨" = "Cancel" ! "È¡Ïû" = "Categories..." "@#$CMT$#@"="//////////////////////////////////////////////////////" "@#$CMT$#@"="//FORM FrmFlat 0 0 160 160" --- 11,45 ---- "Up" = "Éϼ¶" "@#$CMT$#@"="////////////////////////////////" ! "@#$CMT$#@"="//FORM FrmFlatFilter 2 2 156 156" ! "Flat Filter Details" = "ƽÃæ¹ýÂËÆ÷Ïêϸ×ÊÁÏ" ! "Only" = "½ö" ! "Min" = "×îС" ! "No" = "·ñ" ! "Priority:" = "ÓÅÏȼ¶:" ! "OR" = "»ò" ! "AND" = "Óë" ! "All" = "È«²¿" "@#$CMT$#@"="//No" ! "Yes" = "ÊÇ" ! "Dated Tasks:" = "¹ýÆÚµÄÈÎÎñ:" ! "Date in limit:" = "ÏÞ¶¨ÈÕÆÚ:" ! "Priority" = "ÓÅÏȼ¶" ! "Date" = "ÈÕÆÚ" ! "Sort:" = "ÅÅÐò" ! "None" = "ÎÞ" ! "Overdue" = "ÒѹýÆÚ" ! "Today" = "½ñÌì" ! "2 days" = "2 Ìì" ! "3 days" = "3 Ìì" ! "4 days" = "4 Ìì" ! "5 days" = "5 Ìì" ! "6 days" = "6 Ìì" ! "1 week" = "1 ÖÜ" ! "2 weeks" = "2 ÖÜ" ! "3 weeks" = "3 ÖÜ" ! "4 weeks" = "4 ÖÜ" ! "OK" = "È·¶¨" ! "Cancel" = "È¡Ïû" ! "Categories..." = "·ÖÀà..." "@#$CMT$#@"="//////////////////////////////////////////////////////" "@#$CMT$#@"="//FORM FrmFlat 0 0 160 160" *************** *** 46,96 **** "@#$CMT$#@"="////////////////////////////////////////////////" "@#$CMT$#@"="//MENU MenuFlat" ! "·ÖÀà..." = "Edit" ! "±à¼" = "Publish to LinkMaster" ! "·¢²¼µ½LinkMaster" = "Link via LinkMaster" ! "Á´½Óµ½LinkMaster" = "Remove Link" ! "ɾ³ýÁ´½Ó" = "Add Note" ! "Ìí¼Ó±¸×¢" = "ToDo Link All" ! "ToDo Link All" = "ToDo Unlink All" ! "ToDo Unlink All" = "Options" ! "Ñ¡Ïî" = "Project Props." ! "ÏîÄ¿ÊôÐÔ." = "Display Prefs." ! "ÏÔʾÊôÐÔ" = "Flat Filter" "@#$CMT$#@"="//////////////////////////////////////////////////" "@#$CMT$#@"="//MENU FrmMainMainMenu" ! "ƽÃæ¹ýÂËÆ÷" = "Project" ! "ÏîÄ¿" = "Close" ! "¹Ø±Õ" = "Export" ! "µ¼³ö" = "Delete Done Tasks" ! "ɾ³ýÒÑÍê³ÉµÄÈÎÎñ" = "Sync With ToDo" ! "ͬ²½ ToDo" = "Set/Reset Attributes" ! "ÉèÖÃ/ÖØÖÃÊôÐÔ" = "Task Defaults" ! "ÈÎÎñÔ¤ÉèÖµ" = "About Progect" "@#$CMT$#@"="//-------------------------" "@#$CMT$#@"="//Edit" ! "¹ØÓÚProgect" = "New (Sub)Task" ! "ÐÂ(×Ó)ÈÎÎñ" = "Cut" ! "¼ô½Ó" = "Copy" ! "¸´ÖÆ" = "Copy Children" ! "¸´ÖÆ×ÓÈÎÎñ" = "Paste" ! "Õ³Ìù" = "Paste As Child" "@#$CMT$#@"="//Add Note" ! "Õ³Ìù³É×ÓÈÎÎñ" = "Delete Task" "@#$CMT$#@"="//Publish to LinkMaster" "@#$CMT$#@"="//Link via LinkMaster" "@#$CMT$#@"="//Remove Link" "@#$CMT$#@"="//----------------------------" ! "ɾ³ýÈÎÎñ" = "Tree" ! "Ê÷" = "Delete Children" ! "ɾ³ý×ÓÈÎÎñ" = "Expand all" ! "È«²¿Õ¹¿ª" = "Collapse all" ! "È«²¿ÊÕËõ" = "Collapse father" ! "ÊÕÖÁ¸¸Ïî" = "Go to top" ! "µ½Îļþ¶¥²¿" = "Go to bottom" ! "µ½Îļþµ×²¿" = "Repair Tree" "@#$CMT$#@"="//-----------------------" ! "ÐÞ¸´Ê÷" = "View" ! "²é¿´" = "Clear Subtask View" ! "Çå³ý×ÓÈÎÎñÊÓͼ" = "Delete Tasks in View" "@#$CMT$#@"="//Project Props." "@#$CMT$#@"="//Display Prefs." --- 47,97 ---- "@#$CMT$#@"="////////////////////////////////////////////////" "@#$CMT$#@"="//MENU MenuFlat" ! "Edit" = "±à¼" ! "Publish to LinkMaster" = "·¢²¼µ½LinkMaster" ! "Link via LinkMaster" = "Á´½Óµ½LinkMaster" ! "Remove Link" = "ɾ³ýÁ´½Ó" ! "Add Note" = "Ìí¼Ó±¸×¢" ! "ToDo Link All" = "ToDo Link All" ! "ToDo Unlink All" = "ToDo Unlink All" ! "Options" = "Ñ¡Ïî" ! "Project Props." = "ÏîÄ¿ÊôÐÔ." ! "Display Prefs." = "ÏÔʾÊôÐÔ" ! "Flat Filter" = "ƽÃæ¹ýÂËÆ÷" "@#$CMT$#@"="//////////////////////////////////////////////////" "@#$CMT$#@"="//MENU FrmMainMainMenu" ! "Project" = "ÏîÄ¿" ! "Close" = "¹Ø±Õ" ! "Export" = "µ¼³ö" ! "Delete Done Tasks" = "ɾ³ýÒÑÍê³ÉµÄÈÎÎñ" ! "Sync With ToDo" = "ͬ²½ ToDo" ! "Set/Reset Attributes" = "ÉèÖÃ/ÖØÖÃÊôÐÔ" ! "Task Defaults" = "ÈÎÎñÔ¤ÉèÖµ" ! "About Progect" = "¹ØÓÚProgect" "@#$CMT$#@"="//-------------------------" "@#$CMT$#@"="//Edit" ! "New (Sub)Task" = "ÐÂ(×Ó)ÈÎÎñ" ! "Cut" = "¼ô½Ó" ! "Copy" = "¸´ÖÆ" ! "Copy Children" = "¸´ÖÆ×ÓÈÎÎñ" ! "Paste" = "Õ³Ìù" ! "Paste As Child" = "Õ³Ìù³É×ÓÈÎÎñ" "@#$CMT$#@"="//Add Note" ! "Delete Task" = "ɾ³ýÈÎÎñ" "@#$CMT$#@"="//Publish to LinkMaster" "@#$CMT$#@"="//Link via LinkMaster" "@#$CMT$#@"="//Remove Link" "@#$CMT$#@"="//----------------------------" ! "Tree" = "Ê÷" ! "Delete Children" = "ɾ³ý×ÓÈÎÎñ" ! "Expand all" = "È«²¿Õ¹¿ª" ! "Collapse all" = "È«²¿ÊÕËõ" ! "Collapse father" = "ÊÕÖÁ¸¸Ïî" ! "Go to top" = "µ½Îļþ¶¥²¿" ! "Go to bottom" = "µ½Îļþµ×²¿" ! "Repair Tree" = "ÐÞ¸´Ê÷" "@#$CMT$#@"="//-----------------------" ! "View" = "²é¿´" ! "Clear Subtask View" = "Çå³ý×ÓÈÎÎñÊÓͼ" ! "Delete Tasks in View" = "ɾ³ýÏÔʾµÄÈËÎï" "@#$CMT$#@"="//Project Props." "@#$CMT$#@"="//Display Prefs." *************** *** 98,182 **** "@#$CMT$#@"="///////////////////////////////////////////////" "@#$CMT$#@"="//FORM FrmTaskEdit 2 2 156 156" ! "ɾ³ýÏÔʾµÄÈËÎï" = "Task Properties" ! "ÈÎÎñÊôÐÔ" = "Task Description" ! "ÈÎÎñÃèÊö" = "Value:" ! "ÊýÖµ:" = "Type:" ! "ÀàÐÍ:" = "Progress" ! "½ø¶È" = "Numeric" ! "ÊýÖµ" = "Action" ! "È·ÈÏ" = "Info" ! "×ÊÁÏ" = "icon" "@#$CMT$#@"="//Priority:" "@#$CMT$#@"="//No" ! "ͼ±ê" = "Due Date:" "@#$CMT$#@"="//Today" ! "µ½ÆÚÈÕÆÚ:" = "Tomorrow" ! "Ã÷Ìì" = "In one week" ! "Ò»ÖÜÒÔºó" = "No date" ! "ÎÞÈÕÆÚ" = "Choose date" ! "Ñ¡ÔñÈÕÆÚ" = "ToDo Link:" ! "ToDo Link:" = "Category:" "@#$CMT$#@"="//OK" "@#$CMT$#@"="//Cancel" ! "·ÖÀà:" = "Note" ! "±¸×¢" = "Parents" "@#$CMT$#@"="//////////////////////////////////////////////" "@#$CMT$#@"="//MENUID MenuNoteEdit" "@#$CMT$#@"="//OK" "@#$CMT$#@"="//Cancel" ! "Parents" = "Delete" "@#$CMT$#@"="//Date" "@#$CMT$#@"="////////////////////////////////////////////////" "@#$CMT$#@"="//MENU ID MenuNoteEdit" "@#$CMT$#@"="//Edit" ! "ɾ³ý" = "Undo" "@#$CMT$#@"="//Cut" "@#$CMT$#@"="//Copy" "@#$CMT$#@"="//Paste" ! "³·Ïú" = "Select All" ! "È«²¿Ñ¡Ôñ" = "Keyboard" ! "¼üÅÌ" = "Graffiti Help" "@#$CMT$#@"="//////////////////////////////////////////" "@#$CMT$#@"="//MENUID MenuProjectList" "@#$CMT$#@"="//Progect" ! "Graffiti°ïÖú" = "Open" ! "´ò¿ª" = "New" ! "н¨" = "Rename" ! "ÖØÃüÃû" = "ALL" "@#$CMT$#@"="//CATEGORIES ID ProjectDefaultCategoryList 'Unfiled' 'Business' 'Personal'" ! "È«²¿" = "Unfiled" ! "δ·ÖÀà" = "Business" ! "ÉÌÎñ" = "Personal" "@#$CMT$#@"="////////////////////////////////////////" "@#$CMT$#@"="//MENU MenuProjectList" "@#$CMT$#@"="//Projects" ! "˽ÈË" = "Open Project" ! "´ò¿ªÏîÄ¿" = "New Project" ! "ÐÂÏîÄ¿" = "Beam Project" "@#$CMT$#@"="//Project Props." ! "¾ºìÍâ´«ËÍÏîÄ¿" = "Rename Project" ! "ÏîÄ¿ÖØÃüÃû" = "Duplicate Project" ! "¸´ÖÆÏîÄ¿" = "Update Project List" ! "Ë¢ÐÂÏîÄ¿Áбí" = "Delete Project" ! "ɾ³ýÏîÄ¿" = "Help" ! "°ïÖú" = "About" "@#$CMT$#@"="///////////////////////////////////" "@#$CMT$#@"="//ALERT ProgectAbout" "@#$CMT$#@"="//About Progect" ! "¹ØÓÚ" = "Progect ^1 (c) 2003 (GPL)\nL Burgbacher, R Price\n" ! "Progect ^1 (c) 2003 (GPL)\nL Burgbacher, R Price\n" = "Homepage http://progect.sf.net\n" ! "Ö÷Ò³ http://progect.sf.net\n" = "Maintainer ric...@us...\n" ! "Maintainer ric...@us...\n" = "Mailing List http://groups.yahoo.com/group/progect" "@#$CMT$#@"="//OK" "@#$CMT$#@"="////////////////////////////////////////" "@#$CMT$#@"="//FORM FrmChooseName 2 80 156 78" ! "ÓʼþÁбí http://groups.yahoo.com/group/progect" = "Choose a project name" ! "Ñ¡ÔñÒ»¸öÏîÄ¿Ãû³Æ" = "Name:" "@#$CMT$#@"="//OK" "@#$CMT$#@"="//Cancel" "@#$CMT$#@"="/////////////////////////////////////////" "@#$CMT$#@"="//ALERT AltConfirmDelete" ! "Ãû³Æ:" = "Confirmation" ! "È·ÈÏÐÅÏ¢" = "Are your sure you want to delete ^1 ? (This cannot be undone)" "@#$CMT$#@"="//OK" "@#$CMT$#@"="//Cancel" --- 99,183 ---- "@#$CMT$#@"="///////////////////////////////////////////////" "@#$CMT$#@"="//FORM FrmTaskEdit 2 2 156 156" ! "Task Properties" = "ÈÎÎñÊôÐÔ" ! "Task Description" = "ÈÎÎñÃèÊö" ! "Value:" = "ÊýÖµ:" ! "Type:" = "ÀàÐÍ:" ! "Progress" = "½ø¶È" ! "Numeric" = "ÊýÖµ" ! "Action" = "È·ÈÏ" ! "Info" = "×ÊÁÏ" ! "icon" = "ͼ±ê" "@#$CMT$#@"="//Priority:" "@#$CMT$#@"="//No" ! "Due Date:" = "µ½ÆÚÈÕÆÚ:" "@#$CMT$#@"="//Today" ! "Tomorrow" = "Ã÷Ìì" ! "In one week" = "Ò»ÖÜÒÔºó" ! "No date" = "ÎÞÈÕÆÚ" ! "Choose date" = "Ñ¡ÔñÈÕÆÚ" ! "ToDo Link:" = "´ý°ìÊÂÏîÁ´½Ó:" ! "Category:" = "·ÖÀà:" "@#$CMT$#@"="//OK" "@#$CMT$#@"="//Cancel" ! "Note" = "±¸×¢" ! "Parents" = "Éϼ¶" "@#$CMT$#@"="//////////////////////////////////////////////" "@#$CMT$#@"="//MENUID MenuNoteEdit" "@#$CMT$#@"="//OK" "@#$CMT$#@"="//Cancel" ! "Delete" = "ɾ³ý" "@#$CMT$#@"="//Date" "@#$CMT$#@"="////////////////////////////////////////////////" "@#$CMT$#@"="//MENU ID MenuNoteEdit" "@#$CMT$#@"="//Edit" ! "Undo" = "³·Ïú" "@#$CMT$#@"="//Cut" "@#$CMT$#@"="//Copy" "@#$CMT$#@"="//Paste" ! "Select All" = "È«²¿Ñ¡Ôñ" ! "Keyboard" = "¼üÅÌ" ! "Graffiti Help" = "ÊÖд°ïÖú" "@#$CMT$#@"="//////////////////////////////////////////" "@#$CMT$#@"="//MENUID MenuProjectList" "@#$CMT$#@"="//Progect" ! "Open" = "´ò¿ª" ! "New" = "н¨" ! "Rename" = "ÖØÃüÃû" ! "ALL" = "È«²¿" "@#$CMT$#@"="//CATEGORIES ID ProjectDefaultCategoryList 'Unfiled' 'Business' 'Personal'" ! "Unfiled" = "δ·ÖÀà" ! "Business" = "ÉÌÎñ" ! "Personal" = "˽ÈË" "@#$CMT$#@"="////////////////////////////////////////" "@#$CMT$#@"="//MENU MenuProjectList" "@#$CMT$#@"="//Projects" ! "Open Project" = "´ò¿ªÏîÄ¿" ! "New Project" = "ÐÂÏîÄ¿" ! "Beam Project" = "¾ºìÍâ´«ËÍÏîÄ¿" "@#$CMT$#@"="//Project Props." ! "Rename Project" = "ÏîÄ¿ÖØÃüÃû" ! "Duplicate Project" = "¸´ÖÆÏîÄ¿" ! "Update Project List" = "Ë¢ÐÂÏîÄ¿Áбí" ! "Delete Project" = "ɾ³ýÏîÄ¿" ! "Help" = "°ïÖú" ! "About" = "¹ØÓÚ" "@#$CMT$#@"="///////////////////////////////////" "@#$CMT$#@"="//ALERT ProgectAbout" "@#$CMT$#@"="//About Progect" ! "Progect ^1 (c) 2003 (GPL)\nL Burgbacher, R Price\n" = "Progect ^1 (c) 2003 (GPL)\nL Burgbacher, R Price\n" ! "Homepage http://progect.sf.net\n" = "Ö÷Ò³ http://progect.sf.net\n" ! "Maintainer ric...@us...\n" = "ά»¤Õß ric...@us...\n" ! "Mailing List http://groups.yahoo.com/group/progect" = "ÓʼþÁбí http://groups.yahoo.com/group/progect" "@#$CMT$#@"="//OK" "@#$CMT$#@"="////////////////////////////////////////" "@#$CMT$#@"="//FORM FrmChooseName 2 80 156 78" ! "Choose a project name" = "Ñ¡ÔñÒ»¸öÏîÄ¿Ãû³Æ" ! "Name:" = "Ãû³Æ:" "@#$CMT$#@"="//OK" "@#$CMT$#@"="//Cancel" "@#$CMT$#@"="/////////////////////////////////////////" "@#$CMT$#@"="//ALERT AltConfirmDelete" ! "Confirmation" = "È·ÈÏÐÅÏ¢" ! "Are your sure you want to delete ^1 ? (This cannot be undone)" = "È·¶¨ÒªÉ¾³ý^1ô?(´Ë¶¯×÷²»ÄÜ»¹Ô)" "@#$CMT$#@"="//OK" "@#$CMT$#@"="//Cancel" *************** *** 184,246 **** "@#$CMT$#@"="//ALERT AltConfirmCustom" "@#$CMT$#@"="//Confirmation" ! "È·¶¨ÒªÉ¾³ý^1ô?(´Ë¶¯×÷²»ÄÜ»¹Ô)" = "Are you sure you want to ^1 ^2 ? (This cannot be undone)" "@#$CMT$#@"="//OK" "@#$CMT$#@"="//Cancel" "@#$CMT$#@"="//////////////////////////////////" "@#$CMT$#@"="//ALERT AltAlreadyExists" ! "È·¶¨Òª ^1 ^2 ô? (Õâ¸ö²Ù×÷²»Äܸ´Ô)" = "Error" ! "´íÎó" = "A database named ^1 already exists." "@#$CMT$#@"="//////////////////////////////////" "@#$CMT$#@"="//FORM FrmProjectProperties 2 2 156 156" ! "ÏîÄ¿ ^1 ÒÑ´æÔÚ" = "Project Properties" ! "ÏîÄ¿ÊôÐÔ" = "Project Category:" ! "ÏîÄ¿·ÖÀà:" = "Hide done tasks:" ! "Òþ²ØÍê³ÉÁ˵ÄÈÎÎñ:" = "Display due dates:" ! "ÏÔʾµ½ÆÚÈÕ:" = "Display priorities:" ! "ÏÔʾÓÅÏȼ¶" = "Backup project:" ! "ͬ²½Ê±±¸·ÝÏîÄ¿:" = "Delete always warn:" ! "ɾ³ýÇ°×ÜÊǾ¯¸æ:" = "Print year:" ! "´òÓ¡Äê·Ý:" = "Use Father Status:" ! "ʹÓø¸ÈÎÎñ״̬:" = "Auto Sync ToDo:" ! "×Ô¶¯Í¬²½´ý°ìÊÂÏî:" = "Record Completion Date:" "@#$CMT$#@"="//////////////////////////////////////////" "@#$CMT$#@"="//FORM FrmMemoExportProperties 2 2 156 156" ! "¼Ç¼Íê³ÉÈÕÆÚ:" = "Export to MemoPad/Doc" ! "Êä³öµ½MemoPad/Doc" = "Please select export options:" ! "ÇëÑ¡ÔñÊä³öÑ¡Ïî:" = "Done tasks:" ! "Íê³ÉµÄÈÎÎñ:" = "Due dates:" ! "µ½ÆÚÈÕ:" = "Priorities:" ! "ÓÅÏȼ¶:" = "Progress:" ! "½ø¶È:" = "Flat View:" ! "ƽÃæÏÔʾ:" = "DOC format only:" ! "½öDOC ¸ñʽÓÐЧ:" = "Note:" ! "±¸×¢:" = "DOC Format:" ! "DOC ¸ñʽ:" = "RAW TEXT" ! "RAW TEXT" = "HTML <H1>" ! "HTML <H1>" = "HTML <TABLE>" ! "HTML <TABLE>" = "HTML <UL>" ! "HTML <UL>" = "Memo" ! "±¸Íü¼" = "DOC" "@#$CMT$#@"="//////////////////////////////////////////" "@#$CMT$#@"="//FORM FrmSetReset 2 2 156 156" ! "DOC" = "Set/Reset" ! "ÉèÖÃ/ÖØÖÃ" = "Reset Dates:" ! "ÖØÖÃÈÕÆÚ:" = "Reset Progress:" ! "ÖØÖýø¶È:" = "Reset Priority:" ! "ÖØÖÃÓÅÏȼ¶:" = "ToDo Unlink:" "@#$CMT$#@"="//ToDo Link:" "@#$CMT$#@"="///////////////////////////////////////////////////" "@#$CMT$#@"="//FORM FrmDisplayProperties 2 2 156 156" ! "ToDo Unlink:" = "Display Properties" ! "ÏÔʾÊôÐÔ" = "Priority to bold:" "@#$CMT$#@"="//None" "@#$CMT$#@"="//ALL" ! "ÓÅÏÈ˳Ðò´ÖÌåÏÔʾ:" = "Days to bold:" "@#$CMT$#@"="//Overdue" ! "ÈÕÆÚ´ÖÌåÏÔʾ:" = "Max wrap lines:" ! "×î´ó×Ô¶¯»»ÐÐÊý:" = "Strike done tasks:" ! "Strike done tasks:" = "Hide done progress:" ! "Òþ²ØÒÑÍê³É½ø¶È:" = "Hide all progress:" ! "Òþ²ØËùÓнø¶È:" = "Draw Tree Lines:" "@#$CMT$#@"="/////////////////////////////////////////////////" "@#$CMT$#@"="//FORM FrmTaskDefaults 2 80 156 78" --- 185,247 ---- "@#$CMT$#@"="//ALERT AltConfirmCustom" "@#$CMT$#@"="//Confirmation" ! "Are you sure you want to ^1 ^2 ? (This cannot be undone)" = "È·¶¨Òª ^1 ^2 ô? (Õâ¸ö²Ù×÷²»Äܸ´Ô)" "@#$CMT$#@"="//OK" "@#$CMT$#@"="//Cancel" "@#$CMT$#@"="//////////////////////////////////" "@#$CMT$#@"="//ALERT AltAlreadyExists" ! "Error" = "´íÎó" ! "A database named ^1 already exists." = "ÏîÄ¿ ^1 ÒÑ´æÔÚ" "@#$CMT$#@"="//////////////////////////////////" "@#$CMT$#@"="//FORM FrmProjectProperties 2 2 156 156" ! "Project Properties" = "ÏîÄ¿ÊôÐÔ" ! "Project Category:" = "ÏîÄ¿·ÖÀà:" ! "Hide done tasks:" = "Òþ²ØÍê³ÉÁ˵ÄÈÎÎñ:" ! "Display due dates:" = "ÏÔʾµ½ÆÚÈÕ:" ! "Display priorities:" = "ÏÔʾÓÅÏȼ¶" ! "Backup project:" = "ͬ²½Ê±±¸·ÝÏîÄ¿:" ! "Delete always warn:" = "ɾ³ýÇ°×ÜÊǾ¯¸æ:" ! "Print year:" = "´òÓ¡Äê·Ý:" ! "Use Father Status:" = "ʹÓø¸ÈÎÎñ״̬:" ! "Auto Sync ToDo:" = "×Ô¶¯Í¬²½´ý°ìÊÂÏî:" ! "Record Completion Date:" = "¼Ç¼Íê³ÉÈÕÆÚ:" "@#$CMT$#@"="//////////////////////////////////////////" "@#$CMT$#@"="//FORM FrmMemoExportProperties 2 2 156 156" ! "Export to MemoPad/Doc" = "µ¼³öµ½ ¼Çʱ¾/Doc" ! "Please select export options:" = "ÇëÑ¡Ôñµ¼³öÑ¡Ïî:" ! "Done tasks:" = "Íê³ÉµÄÈÎÎñ:" ! "Due dates:" = "µ½ÆÚÈÕ:" ! "Priorities:" = "ÓÅÏȼ¶:" ! "Progress:" = "½ø¶È:" ! "Flat View:" = "ƽÃæÏÔʾ:" ! "DOC format only:" = "½öDOC ¸ñʽÓÐЧ:" ! "Note:" = "±¸×¢:" ! "DOC Format:" = "DOC ¸ñʽ:" ! "RAW TEXT" = "ÔÎı¾" ! "HTML <H1>" = "HTML <H1>" ! "HTML <TABLE>" = "HTML <TABLE>" ! "HTML <UL>" = "HTML <UL>" ! "Memo" = "¼Çʱ¾" ! "DOC" = "DOC" "@#$CMT$#@"="//////////////////////////////////////////" "@#$CMT$#@"="//FORM FrmSetReset 2 2 156 156" ! "Set/Reset" = "ÉèÖÃ/ÖØÖÃ" ! "Reset Dates:" = "ÖØÖÃÈÕÆÚ:" ! "Reset Progress:" = "ÖØÖýø¶È:" ! "Reset Priority:" = "ÖØÖÃÓÅÏȼ¶:" ! "ToDo Unlink:" = "È¡Ïû´ý°ìÊÂÏîÁ´½Ó:" "@#$CMT$#@"="//ToDo Link:" "@#$CMT$#@"="///////////////////////////////////////////////////" "@#$CMT$#@"="//FORM FrmDisplayProperties 2 2 156 156" ! "Display Properties" = "ÏÔʾÊôÐÔ" ! "Priority to bold:" = "ÓÅÏÈ˳Ðò´ÖÌåÏÔʾ:" "@#$CMT$#@"="//None" "@#$CMT$#@"="//ALL" ! "Days to bold:" = "ÈÕÆÚ´ÖÌåÏÔʾ:" "@#$CMT$#@"="//Overdue" ! "Max wrap lines:" = "×î´ó×Ô¶¯»»ÐÐÊý:" ! "Strike done tasks:" = "»®µôÒÑÍê³ÉÈÎÎñ:" ! "Hide done progress:" = "Òþ²ØÒÑÍê³É½ø¶È:" ! "Hide all progress:" = "Òþ²ØËùÓнø¶È:" ! "Draw Tree Lines:" = "ÏÔʾÊ÷½á¹¹Ïß:" "@#$CMT$#@"="/////////////////////////////////////////////////" "@#$CMT$#@"="//FORM FrmTaskDefaults 2 80 156 78" *************** *** 255,328 **** "@#$CMT$#@"="/////////////////////////////////////////" "@#$CMT$#@"="//FORM FrmSubOrAll 2 80 156 78" ! "ÏÔʾÊ÷½á¹¹Ïß:" = "Range of command" ! "ÃüÁΧ" = "The Whole Tree" ! "Õû¸öÊ÷" = "Actual Subview" "@#$CMT$#@"="/////////////////////////////////////////" "@#$CMT$#@"="//FORM FrmIconSelect 0 0 160 160" ! "¸±ÊÓͼ" = "Select icon" ! "Ñ¡Ôñͼ±ê" = "Remove" "@#$CMT$#@"="/////////////////////////////////////////" "@#$CMT$#@"="//FORM FrmCategoriesSelect 0 0 160 160" ! "ɾ³ý" = "Select Categories" ! "Ñ¡Ôñ·ÖÀà" = "Toggle" "@#$CMT$#@"="//////////////////////////////////" ! "Toggle" = "this note" ! "±¾±¸×¢" = "all tasks" ! "ËùÒÔÈÎÎñ" = "all tasks in this subview" ! "ËùÓи±ÊÓͼÖеÄÈÎÎñ" = "all children of this selected task" ! "Ñ¡Ôñ±¾ÈÎÎñϵÄËùÓÐ×ÓÈÎÎñ" = "this task and all its children" ! "±¾ÈÎÎñÒÔ¼°ËùÓÐ×ÓÈÎÎñ" = "all done tasks" ! "ËùÓÐÒÑÍê³ÉµÄÈÎÎñ" = "all done tasks in this view" ! "ËùÓÐÔÚÊÓͼÖÐÒÑÍê³ÉµÄÈÎÎñ" = "You must first select a task to do this." ! "Äã±ØÐëÏÈÑ¡ÔñÒ»¸öÈÎÎñ²ÅÄܼÌÐø." = "LinkMaster is not available." ! "LinkMaster²»¿ÉÓÃ(²»´æÔÚ)." = "LinkInfo not found." ! "ÕÒ²»µ½Á´½ÓÐÅÏ¢(LinkInfo)." = "Not enough memory for this operation" "@#$CMT$#@"="//icon" ! "ûÓÐ×ã¹»µÄÄÚ´æÀ´Ö´Ðб¾²Ù×÷" = "Progect" ! "Progect" = "DOC already exists. Please delete it before export." ! "DOCÎĵµÒÑ´æÔÚ.ÇëÔÚµ¼³öǰɾ³ýËü." = "Your project preferences have been deleted, please go to the preference menu and set them." "@#$CMT$#@"="//delete" ! "ÄãµÄÏîÄ¿ÉèÖÃÒѱ»É¾³ý,Çë½øÈëÉèÖò˵¥ÖØÐÂÉèÖÃÃ." = "reset the dates of" ! "reset the dates of" = "modify" ! "±à¼" = "This link was not valid anymore, it has been deleted." ! "´ËÁ´½Ó²»´æÔÚ,¿ÉÄÜÒѱ»É¾³ý." = "Edit categories..." ! "±à¼·ÖÀà..." = "The project you are trying to open needs version ^1 of progect. Please upgrade at sf.net/projects/progect" "@#$CMT$#@"="////////////////////////////////////" "@#$CMT$#@"="//CATEGORIES ID InitialCategory 'Unfiled'" "@#$CMT$#@"="//Unfiled" ! "±¾ÏîÄ¿¿ÉÄÜÐèÒª progect ^1 °æ²ÅÄÜ´ò¿ª.Çëµ½ sf.net/projects/progect Õâ¸öÍøÖ·Éý¼¶." = "+7" ! "+7" = "-" ! "-" = "/" ! "/" = "0%" ! "0%" = "1" ! "1" = "10%" ! "10%" = "100%" ! "100%" = "123456789" ! "123456789" = "123456789012345" ! "123456789012345" = "1234567890123456" ! "1234567890123456" = "1234567890123456789012345" ! "1234567890123456789012345" = "12345678901234567890123456789012" ! "12345678901234567890123456789012" = "2" ! "2" = "20%" ! "20%" = "3" ! "3" = "30%" ! "30%" = "4" ! "4" = "40%" ! "40%" = "5" ! "5" = "50%" ! "50%" = "6" ! "6" = "60%" ! "60%" = "7" ! "7" = "70%" ! "70%" = "8" ! "8" = "80%" ! "80%" = "9" ! "9" = "90%" ! "90%" = "\001" ! "\001" = "\002" ! "\002" = "\003" ! "\003" = "\004" ! "\004" = "\005" ! "\005" = "\006" ! "\006" = "^1 ^2 ^3" END --- 256,329 ---- "@#$CMT$#@"="/////////////////////////////////////////" "@#$CMT$#@"="//FORM FrmSubOrAll 2 80 156 78" ! "Range of command" = "ÃüÁΧ" ! "The Whole Tree" = "Õû¸öÊ÷" ! "Actual Subview" = "µ±Ç°×ÓÊÓͼ" "@#$CMT$#@"="/////////////////////////////////////////" "@#$CMT$#@"="//FORM FrmIconSelect 0 0 160 160" ! "Select icon" = "Ñ¡Ôñͼ±ê" ! "Remove" = "ɾ³ý" "@#$CMT$#@"="/////////////////////////////////////////" "@#$CMT$#@"="//FORM FrmCategoriesSelect 0 0 160 160" ! "Select Categories" = "Ñ¡Ôñ·ÖÀà" ! "Toggle" = "Çл»" "@#$CMT$#@"="//////////////////////////////////" ! "this note" = "±¾±¸×¢" ! "all tasks" = "ËùÓÐÈÎÎñ" ! "all tasks in this subview" = "±¾×ÓÊÓͼÖеÄËùÓÐÈÎÎñ" ! "all children of this selected task" = "´ËÑ¡ÖÐÈÎÎñϵÄËùÓÐ×ÓÈÎÎñ" ! "this task and all its children" = "±¾ÈÎÎñÒÔ¼°ËùÓÐ×ÓÈÎÎñ" ! "all done tasks" = "ËùÓÐÒÑÍê³ÉµÄÈÎÎñ" ! "all done tasks in this view" = "´ËÊÓͼÖÐËùÓÐÒÑÍê³ÉµÄÈÎÎñ" ! "You must first select a task to do this." = "Äã±ØÐëÏÈÑ¡ÔñÒ»¸öÈÎÎñ²ÅÄÜ×ö´Ë²Ù×÷." ! "LinkMaster is not available." = "LinkMaster²»´æÔÚ." ! "LinkInfo not found." = "ÕÒ²»µ½ LinkInfo." ! "Not enough memory for this operation" = "ûÓÐ×ã¹»µÄÄÚ´æÀ´Ö´Ðб¾²Ù×÷" "@#$CMT$#@"="//icon" ! "Progect" = "Progect" ! "DOC already exists. Please delete it before export." = "DOCÎĵµÒÑ´æÔÚ. ÇëÔÚµ¼³öǰɾ³ýËü." ! "Your project preferences have been deleted, please go to the preference menu and set them." = "ÄãµÄÏîÄ¿ÉèÖÃÒѱ»É¾³ý, Çë½øÈëÉèÖò˵¥ÖØÐÂÉèÖá£" "@#$CMT$#@"="//delete" ! "reset the dates of" = "reset the dates of" ! "modify" = "ÐÞ¸Ä" ! "This link was not valid anymore, it has been deleted." = "´ËÁ´½Ó²»ÔÙÓÐЧ£¬Òѱ»É¾³ý." ! "Edit categories..." = "±à¼·ÖÀà..." ! "The project you are trying to open needs version ^1 of progect. Please upgrade at sf.net/projects/progect" = "±¾ÏîÄ¿¿ÉÄÜÐèÒª progect ^1 °æ²ÅÄÜ´ò¿ª.Çëµ½ sf.net/projects/progect Õâ¸öÍøÖ·Éý¼¶." "@#$CMT$#@"="////////////////////////////////////" "@#$CMT$#@"="//CATEGORIES ID InitialCategory 'Unfiled'" "@#$CMT$#@"="//Unfiled" ! "+7" = "+7" ! "-" = "-" ! "/" = "/" ! "0%" = "0%" ! "1" = "1" ! "10%" = "10%" ! "100%" = "100%" ! "123456789" = "123456789" ! "123456789012345" = "123456789012345" ! "1234567890123456" = "1234567890123456" ! "1234567890123456789012345" = "1234567890123456789012345" ! "12345678901234567890123456789012" = "12345678901234567890123456789012" ! "2" = "2" ! "20%" = "20%" ! "3" = "3" ! "30%" = "30%" ! "4" = "4" ! "40%" = "40%" ! "5" = "5" ! "50%" = "50%" ! "6" = "6" ! "60%" = "60%" ! "7" = "7" ! "70%" = "70%" ! "8" = "8" ! "80%" = "80%" ! "9" = "9" ! "90%" = "90%" ! "\001" = "\001" ! "\002" = "\002" ! "\003" = "\003" ! "\004" = "\004" ! "\005" = "\005" ! "\006" = "\006" ! "^1 ^2 ^3" = "^1 ^2 ^3" END |
|
From: Rick P. <ric...@us...> - 2004-03-28 04:12:08
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17276 Modified Files: Tag: OBJECT_INTERNALS_BRANCH ChooseNameForm.cc Project.cc Project.h ProjectGUI.cc ProjectGUI.h ProjectList.cc String.cc progect.rcp progectRsc.h Log Message: Various bug fixes, still need to handle cancel from project name dialog correctly, currently it's ignored. Index: Project.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/Project.h,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -C2 -d -r1.1.2.11 -r1.1.2.12 *** Project.h 27 Mar 2004 01:16:37 -0000 1.1.2.11 --- Project.h 28 Mar 2004 04:00:49 -0000 1.1.2.12 *************** *** 66,70 **** Error renameProject(const PalmDBInfo &newInfo); ! Error Project::deleteProject(void); Error duplicateProject(const PalmDBInfo &newName); --- 66,70 ---- Error renameProject(const PalmDBInfo &newInfo); ! Error deleteProject(void); Error duplicateProject(const PalmDBInfo &newName); Index: ProjectGUI.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectGUI.cc,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -C2 -d -r1.1.2.8 -r1.1.2.9 *** ProjectGUI.cc 28 Mar 2004 03:08:08 -0000 1.1.2.8 --- ProjectGUI.cc 28 Mar 2004 04:00:49 -0000 1.1.2.9 *************** *** 41,55 **** Error ProjectGUI::create(ProjectGUI &createdProject) { PalmDBInfo newProjectInfo; ! newProjectInfo=selectProjectName(newProjectInfo); ! Error error=Project::createProject(newProjectInfo); createdProject=newProjectInfo; - if (error.error()) - error.showErrorToUser(); - return error; } --- 41,57 ---- Error ProjectGUI::create(ProjectGUI &createdProject) { + Error error; PalmDBInfo newProjectInfo; ! error = selectProjectName(newProjectInfo); ! if (error.error()) ! return error; ! error=Project::createProject(newProjectInfo); ! if (error.error()) ! return error; createdProject=newProjectInfo; return error; } *************** *** 62,66 **** Error ProjectGUI::rename(void) { ! return renameProject(selectProjectName(projectInfo)); } --- 64,75 ---- Error ProjectGUI::rename(void) { ! Error error; ! PalmDBInfo newName=projectInfo; ! ! error=selectProjectName(newName); ! if (error.error()) ! return error; ! ! return renameProject(newName); } *************** *** 72,76 **** Error ProjectGUI::duplicate(void) { ! return duplicateProject(selectProjectName(projectInfo)); } --- 81,92 ---- Error ProjectGUI::duplicate(void) { ! Error error; ! PalmDBInfo newName=projectInfo; ! ! error=selectProjectName(newName); ! if (error.error()) ! return error; ! ! return duplicateProject(newName); } *************** *** 86,91 **** ! PalmDBInfo ProjectGUI::selectProjectName(const PalmDBInfo &defaultName) { ! return ShowChooseNameDialog(defaultName); } --- 102,114 ---- ! Error ProjectGUI::selectProjectName(PalmDBInfo &defaultName) { ! defaultName= ShowChooseNameDialog(defaultName); ! ! if ( ! (defaultName.getName().StrLen() == 0) ! ) ! return Error(errNone,AltInvalidProjectName,defaultName.getName()); ! ! return Error(); } Index: progect.rcp =================================================================== RCS file: /cvsroot/progect/progect/progect.rcp,v retrieving revision 1.66.4.4 retrieving revision 1.66.4.5 diff -C2 -d -r1.66.4.4 -r1.66.4.5 *** progect.rcp 28 Mar 2004 03:08:08 -0000 1.66.4.4 --- progect.rcp 28 Mar 2004 04:00:49 -0000 1.66.4.5 *************** *** 368,371 **** --- 368,387 ---- END + ALERT AltInvalidProjectName + ERROR + BEGIN + TITLE "Error" + MESSAGE "The project name [^1] is invalid. Aborting operation." + BUTTONS "OK" + END + + ALERT AltDuplicateProjectName + ERROR + BEGIN + TITLE "Error" + MESSAGE "The project name [^1] is a duplicate. Aborting operation." + BUTTONS "OK" + END + FORM FrmProjectProperties 2 2 156 156 MODAL Index: ProjectList.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectList.cc,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -C2 -d -r1.1.2.11 -r1.1.2.12 *** ProjectList.cc 28 Mar 2004 02:29:47 -0000 1.1.2.11 --- ProjectList.cc 28 Mar 2004 04:00:49 -0000 1.1.2.12 *************** *** 95,99 **** // make sure that we don't have a name that is too long ErrFatalDisplayIf(dbNew.getName().StrLen()+1 > sizeof(currentEntry->databaseName),"ProjectList::renameProject:dbNew name is too long."); ! DmWrite(currentEntry, OffsetOf(ProjectListDB::ProjectListEntry, databaseName), dbNew.getName(), dbNew.getName().StrLen()); UInt16 cardNumber=dbNew.getCardNumber(); DmWrite(currentEntry, OffsetOf(ProjectListDB::ProjectListEntry, cardNumber), &cardNumber, sizeof(UInt16)); --- 95,99 ---- // make sure that we don't have a name that is too long ErrFatalDisplayIf(dbNew.getName().StrLen()+1 > sizeof(currentEntry->databaseName),"ProjectList::renameProject:dbNew name is too long."); ! DmWrite(currentEntry, OffsetOf(ProjectListDB::ProjectListEntry, databaseName), dbNew.getName(), dbNew.getName().StrLen()+1); UInt16 cardNumber=dbNew.getCardNumber(); DmWrite(currentEntry, OffsetOf(ProjectListDB::ProjectListEntry, cardNumber), &cardNumber, sizeof(UInt16)); Index: String.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/String.cc,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -C2 -d -r1.1.2.7 -r1.1.2.8 *** String.cc 28 Mar 2004 03:08:08 -0000 1.1.2.7 --- String.cc 28 Mar 2004 04:00:49 -0000 1.1.2.8 *************** *** 99,103 **** } ! length = stringSize; ::StrNCopy(internalString,s,charCount); --- 99,103 ---- } ! length = charCount; ::StrNCopy(internalString,s,charCount); Index: ChooseNameForm.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/ChooseNameForm.cc,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** ChooseNameForm.cc 25 Mar 2004 04:22:48 -0000 1.1.2.2 --- ChooseNameForm.cc 28 Mar 2004 04:00:49 -0000 1.1.2.3 *************** *** 36,45 **** FieldPtr nameField; Char *tempName=NULL; ! String returnValue; frm=FrmInitForm(FrmChooseName); nameField=static_cast<FieldPtr>(GetObjectFromForm(frm,Fld_Project_Name)); ! SetFieldTextFromStr(nameField,databaseInfo.getName(),false); FrmDrawForm(frm); // have to do now to be compatible with pre-3.5 --- 36,45 ---- FieldPtr nameField; Char *tempName=NULL; ! String returnValue = databaseInfo.getName(); frm=FrmInitForm(FrmChooseName); nameField=static_cast<FieldPtr>(GetObjectFromForm(frm,Fld_Project_Name)); ! SetFieldTextFromStr(nameField,returnValue,false); FrmDrawForm(frm); // have to do now to be compatible with pre-3.5 Index: progectRsc.h =================================================================== RCS file: /cvsroot/progect/progect/progectRsc.h,v retrieving revision 1.31.6.4 retrieving revision 1.31.6.5 diff -C2 -d -r1.31.6.4 -r1.31.6.5 *** progectRsc.h 28 Mar 2004 03:08:08 -0000 1.31.6.4 --- progectRsc.h 28 Mar 2004 04:00:49 -0000 1.31.6.5 *************** *** 121,124 **** --- 121,126 ---- #define AltDefaultError 1006 #define AltNotImplemented 1007 + #define AltInvalidProjectName 1008 + #define AltDuplicateProjectName 1009 // fields Index: ProjectGUI.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectGUI.h,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -C2 -d -r1.1.2.8 -r1.1.2.9 *** ProjectGUI.h 28 Mar 2004 03:08:08 -0000 1.1.2.8 --- ProjectGUI.h 28 Mar 2004 04:00:49 -0000 1.1.2.9 *************** *** 50,54 **** static Error create(ProjectGUI &createdProject); ! static PalmDBInfo selectProjectName(const PalmDBInfo &defaultName); }; --- 50,54 ---- static Error create(ProjectGUI &createdProject); ! static Error selectProjectName(PalmDBInfo &defaultName); }; Index: Project.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/Project.cc,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -C2 -d -r1.1.2.13 -r1.1.2.14 *** Project.cc 28 Mar 2004 03:08:08 -0000 1.1.2.13 --- Project.cc 28 Mar 2004 04:00:49 -0000 1.1.2.14 *************** *** 81,84 **** --- 81,90 ---- ErrFatalDisplayIf(databaseNameNew.StrLen()+1 > dmDBNameLength,"Project::createProject:databaseNameNew is too long."); + // +++ FIX THIS +++ Need to implement == for PalmDBInfo + /* + // return error if new database name is the same as old one + if (projectInfo == newInfo) + return Error(errNone,AltDuplicateProjectName,newInfo.getName()); + */ // find the database LocalID dbID = DmFindDatabase(cardNumberOrig, databaseNameOrig); *************** *** 151,170 **** Error Project::duplicateProject(const PalmDBInfo &newInfo) { - /* - Char src[dmDBNameLength]; - Char dbname[dmDBNameLength]; - UInt16 recNum; - LocalID newID, oldID; - DmOpenRef newDB, oldDB; - MemHandle hOld, hNew; - TaskRecordType *pOld, *pNew; - UInt16 i; - UInt16 index; - UInt16 cardNo = 0; - UInt16 oldAttr, newAttr; - LocalID appInfoID; - Err err; - MemPtr oldP, newP; - */ Error error; --- 157,160 ---- |
|
From: Rick P. <ric...@us...> - 2004-03-28 03:19:22
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10458 Modified Files: Tag: OBJECT_INTERNALS_BRANCH Error.cc Error.h Project.cc ProjectGUI.cc ProjectGUI.h ProjectListForm.cc ProjectListForm.h String.cc String.h TableHandler.h progect.rcp progectRsc.h Log Message: Improved error handling, particularly in ProjectListForm where the error is handled for all items in two places instead of in each function. Index: TableHandler.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/TableHandler.h,v retrieving revision 1.1.2.21 retrieving revision 1.1.2.22 diff -C2 -d -r1.1.2.21 -r1.1.2.22 *** TableHandler.h 20 Mar 2004 15:38:17 -0000 1.1.2.21 --- TableHandler.h 28 Mar 2004 03:08:08 -0000 1.1.2.22 *************** *** 33,36 **** --- 33,38 ---- #include "SelectionHandler.h" + #include "sections.h" + // ***** README ***** README ***** README ***** *************** *** 80,93 **** const Int16* const virtualColumnMapping_, UInt16 _columns=1 ! ); ! ~TableHandler(); ! Boolean handleTableEvents(EventType* e); ! Boolean handleScrollEvents(EventPtr e); ! Boolean handleKeyEvents(EventPtr e); ! void scroll(WinDirectionType direction, UInt16 units, Boolean byLine); ! void syncTable(void); Boolean tableHasSelection(void) --- 82,95 ---- const Int16* const virtualColumnMapping_, UInt16 _columns=1 ! ) UISECT; ! ~TableHandler() UISECT; ! Boolean handleTableEvents(EventType* e) UISECT; ! Boolean handleScrollEvents(EventPtr e) UISECT; ! Boolean handleKeyEvents(EventPtr e) UISECT; ! void scroll(WinDirectionType direction, UInt16 units, Boolean byLine) UISECT; ! void syncTable(void) UISECT; Boolean tableHasSelection(void) *************** *** 96,100 **** }; ! UInt16 getCurrentSelection(void); protected: --- 98,102 ---- }; ! UInt16 getCurrentSelection(void) UISECT; protected: *************** *** 117,121 **** // Use only if required // ! TablePtr getTablePtr(void); Drawable& TableHandler::getDrawable(void) { --- 119,123 ---- // Use only if required // ! TablePtr getTablePtr(void) UISECT; Drawable& TableHandler::getDrawable(void) { *************** *** 123,141 **** }; ! UInt16 numberOfRowsInTable(void); ! void updateScrollButtons(void); // callbacks ! void customDrawTableItem(Int16 row, Int16 column, RectangleType *bound); Err getTextHandle(const Int16 row, const Int16 column, const Boolean editable, MemHandle* dataH, Int16* dataOffset, ! Int16* dataSize, FieldPtr fld); ! Boolean setTextValue(Int16 const row, const Int16 column); private: ! void resetScrollRate(void); ! void adjustScrollRate(void); UInt16 tableID; --- 125,143 ---- }; ! UInt16 numberOfRowsInTable(void) UISECT; ! void updateScrollButtons(void) UISECT; // callbacks ! void customDrawTableItem(Int16 row, Int16 column, RectangleType *bound) UISECT; Err getTextHandle(const Int16 row, const Int16 column, const Boolean editable, MemHandle* dataH, Int16* dataOffset, ! Int16* dataSize, FieldPtr fld) UISECT; ! Boolean setTextValue(Int16 const row, const Int16 column) UISECT; private: ! void resetScrollRate(void) UISECT; ! void adjustScrollRate(void) UISECT; UInt16 tableID; Index: ProjectListForm.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectListForm.cc,v retrieving revision 1.1.2.22 retrieving revision 1.1.2.23 diff -C2 -d -r1.1.2.22 -r1.1.2.23 *** ProjectListForm.cc 27 Mar 2004 13:37:32 -0000 1.1.2.22 --- ProjectListForm.cc 28 Mar 2004 03:08:08 -0000 1.1.2.23 *************** *** 122,125 **** --- 122,126 ---- { Boolean handled = true; + Error error; switch (command) *************** *** 130,134 **** case MenuProjectListNew: case Btn_List_New: ! newProject(); tableHandler->syncTable(); break; --- 131,135 ---- case MenuProjectListNew: case Btn_List_New: ! error=newProject(); tableHandler->syncTable(); break; *************** *** 137,140 **** --- 138,144 ---- }; + // if there has been an error, show to user... + error.showErrorToUser(); + // if it's been handled, then we can return if (handled) *************** *** 144,149 **** if (!tableHandler->tableHasSelection()) { ! Error error(errNone,StrErrSelectProject); ! error.showErrorToUser(); return false; } --- 148,153 ---- if (!tableHandler->tableHasSelection()) { ! Error errorNoSelection(errNone,AltSelectionRequired); ! errorNoSelection.showErrorToUser(); return false; } *************** *** 158,181 **** case MenuProjectListOpen: case Btn_List_Open: ! openProject(selected); break; case MenuProjectListBeam: ! beamProject(selected); break; case MenuMainPreferences: ! projectProperties(selected); tableHandler->syncTable(); break; case MenuProjectListRename: case Btn_List_Rename: ! renameProject(selected); tableHandler->syncTable(); break; case MenuProjectListDuplicate: ! duplicateProject(selected); tableHandler->syncTable(); break; case MenuProjectListDelete: ! deleteProject(selected); tableHandler->syncTable(); break; --- 162,185 ---- case MenuProjectListOpen: case Btn_List_Open: ! error=openProject(selected); break; case MenuProjectListBeam: ! error=beamProject(selected); break; case MenuMainPreferences: ! error=projectProperties(selected); tableHandler->syncTable(); break; case MenuProjectListRename: case Btn_List_Rename: ! error=renameProject(selected); tableHandler->syncTable(); break; case MenuProjectListDuplicate: ! error=duplicateProject(selected); tableHandler->syncTable(); break; case MenuProjectListDelete: ! error=deleteProject(selected); tableHandler->syncTable(); break; *************** *** 185,188 **** --- 189,194 ---- } + error.showErrorToUser(); + return handled; } Index: progect.rcp =================================================================== RCS file: /cvsroot/progect/progect/progect.rcp,v retrieving revision 1.66.4.3 retrieving revision 1.66.4.4 diff -C2 -d -r1.66.4.3 -r1.66.4.4 *** progect.rcp 27 Mar 2004 03:42:12 -0000 1.66.4.3 --- progect.rcp 28 Mar 2004 03:08:08 -0000 1.66.4.4 *************** *** 344,347 **** --- 344,371 ---- END + ALERT AltSelectionRequired + INFORMATION + BEGIN + TITLE "Selection Required" + MESSAGE "Unable to do that without something selected." + BUTTONS "OK" + END + + ALERT AltDefaultError + ERROR + BEGIN + TITLE "Error" + MESSAGE "Error occured ^1 ^2\n[PalmOS Error number ^3]" + BUTTONS "OK" + END + + ALERT AltNotImplemented + ERROR + BEGIN + TITLE "Error" + MESSAGE "This feature has not been implemented yet." + BUTTONS "OK" + END + FORM FrmProjectProperties 2 2 156 156 MODAL *************** *** 516,520 **** STRING StrAllDoneTasksInThisView "all done tasks in this view" STRING StrSelectTask "You must first select a task to do this." - STRING StrErrSelectProject "You must first select a project to do this." STRING StrLinkMasterIsNotAvailable "LinkMaster is not available." STRING StrLinkInfoNotFound "LinkInfo not found." --- 540,543 ---- Index: Error.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/Error.h,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** Error.h 26 Mar 2004 21:44:28 -0000 1.1.2.3 --- Error.h 28 Mar 2004 03:08:08 -0000 1.1.2.4 *************** *** 33,39 **** { public: ! Error(const Err palmOSError_=errNone, const UInt16 errorResourceString_=0):errorResourceString(errorResourceString_),palmOSError(palmOSError_) { ! hasError = (palmOSError_ != errNone); } ; --- 33,48 ---- { public: ! Error(const Err palmOSError_=errNone, ! const DmResID dialogResource_=0, ! const String& firstString_=String(), ! const String& secondString_=String()) ! : ! palmOSError(palmOSError_), ! dialogResource(dialogResource_), ! firstString(firstString_), ! secondString(secondString_) ! { ! hasError = ((palmOSError_ != errNone)||(dialogResource != 0)); } ; *************** *** 42,51 **** return hasError; }; ! void showErrorToUser(void); private: - UInt16 errorResourceString; Err palmOSError; Boolean hasError; }; --- 51,62 ---- return hasError; }; ! UInt16 showErrorToUser(void); private: Err palmOSError; + UInt16 dialogResource; Boolean hasError; + String firstString; + String secondString; }; Index: String.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/String.cc,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -C2 -d -r1.1.2.6 -r1.1.2.7 *** String.cc 27 Mar 2004 13:46:27 -0000 1.1.2.6 --- String.cc 28 Mar 2004 03:08:08 -0000 1.1.2.7 *************** *** 45,49 **** return *this; // x = x ! copyFromCharPtr(s.internalString,s.length); return *this; --- 45,49 ---- return *this; // x = x ! copyFromCharPtr(s.internalString,s.length); return *this; *************** *** 91,94 **** --- 91,95 ---- UInt16 stringSize=charCount+1; + // +++ FIX THIS +++ Changing the capacity of the string should be a separate function if (capacity < stringSize) { *************** *** 120,123 **** --- 121,134 ---- } + void String::strIToA(Int32 number) + { + Char toString[maxStrIToALen]; + + StrIToA(toString, number); + + copyFromCharPtr(toString,maxStrIToALen); + } + + // string3 = string1 + string2 string3 = operator+(string1,string2) String operator+(const String& string1, const String& string2) Index: Error.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/Error.cc,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** Error.cc 26 Mar 2004 02:26:55 -0000 1.1.2.2 --- Error.cc 28 Mar 2004 03:08:08 -0000 1.1.2.3 *************** *** 27,34 **** #include "Error.h" #include "String.h" ! void Error::showErrorToUser(void) { ! ErrFatalDisplay("Error::showErrorToUser:Currently not implemented, however there was an error you need to know about."); } --- 27,47 ---- #include "Error.h" #include "String.h" + #include "progectRsc.h" ! UInt16 Error::showErrorToUser(void) { ! String palmOSErrorNumber; ! ! // if no error, nothing to show... ! if (!error()) ! return static_cast<UInt16>(-1); ! ! if (!dialogResource) ! dialogResource=AltDefaultError; ! ! if (palmOSError) ! palmOSErrorNumber.strIToA(palmOSError); ! ! return FrmCustomAlert(dialogResource, firstString, secondString, palmOSErrorNumber); } Index: Project.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/Project.cc,v retrieving revision 1.1.2.12 retrieving revision 1.1.2.13 diff -C2 -d -r1.1.2.12 -r1.1.2.13 *** Project.cc 27 Mar 2004 03:42:12 -0000 1.1.2.12 --- Project.cc 28 Mar 2004 03:08:08 -0000 1.1.2.13 *************** *** 146,154 **** Error Project::openProject(UInt16 mode) { ! ErrFatalDisplayIf(dbOpen,"Project::openProject:dbOpen is true"); ! ! // +++ FIX THIS +++ ! ErrFatalDisplay("Project::openProject:not implemented"); ! return Error(); } --- 146,150 ---- Error Project::openProject(UInt16 mode) { ! return Error(errNone,AltNotImplemented); } Index: ProjectListForm.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectListForm.h,v retrieving revision 1.1.2.16 retrieving revision 1.1.2.17 diff -C2 -d -r1.1.2.16 -r1.1.2.17 *** ProjectListForm.h 26 Mar 2004 02:26:55 -0000 1.1.2.16 --- ProjectListForm.h 28 Mar 2004 03:08:08 -0000 1.1.2.17 *************** *** 45,53 **** // void forceDatabaseListResync(void); ! void openProject(ProjectGUI &theProject) { ! theProject.open(); }; ! void newProject(void) { ProjectGUI createdProject; --- 45,54 ---- // void forceDatabaseListResync(void); ! Error openProject(ProjectGUI &theProject) { ! return theProject.open(); }; ! ! Error newProject(void) { ProjectGUI createdProject; *************** *** 56,80 **** if (!error.error()) ! createdProject.open(); }; ! void beamProject(ProjectGUI &theProject) { ! theProject.beam(); }; ! void projectProperties(ProjectGUI &theProject) { ! theProject.properties(); }; ! void renameProject(ProjectGUI &theProject) { ! theProject.rename(); }; ! void duplicateProject(ProjectGUI &theProject) { ! theProject.duplicate(); }; ! void deleteProject(ProjectGUI &theProject) { ! theProject.destroy(); }; --- 57,83 ---- if (!error.error()) ! error=createdProject.open(); ! ! return error; }; ! Error beamProject(ProjectGUI &theProject) { ! return theProject.beam(); }; ! Error projectProperties(ProjectGUI &theProject) { ! return theProject.properties(); }; ! Error renameProject(ProjectGUI &theProject) { ! return theProject.rename(); }; ! Error duplicateProject(ProjectGUI &theProject) { ! return theProject.duplicate(); }; ! Error deleteProject(ProjectGUI &theProject) { ! return theProject.destroy(); }; Index: String.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/String.h,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -C2 -d -r1.1.2.7 -r1.1.2.8 *** String.h 27 Mar 2004 13:46:27 -0000 1.1.2.7 --- String.h 28 Mar 2004 03:08:08 -0000 1.1.2.8 *************** *** 82,85 **** --- 82,87 ---- void loadString(DmResID stringToLoad); + void strIToA(Int32 number); + protected: void copyFromCharPtr(const Char *s,UInt16 charCount); Index: progectRsc.h =================================================================== RCS file: /cvsroot/progect/progect/progectRsc.h,v retrieving revision 1.31.6.3 retrieving revision 1.31.6.4 diff -C2 -d -r1.31.6.3 -r1.31.6.4 *** progectRsc.h 27 Mar 2004 03:42:12 -0000 1.31.6.3 --- progectRsc.h 28 Mar 2004 03:08:08 -0000 1.31.6.4 *************** *** 118,121 **** --- 118,124 ---- #define AltAlreadyExists 1003 #define AltConfirmCustom 1004 + #define AltSelectionRequired 1005 + #define AltDefaultError 1006 + #define AltNotImplemented 1007 // fields *************** *** 155,161 **** #define StrDBVersionIncorrect 1022 - // Error Strings - #define StrErrSelectProject 1023 - // check boxes #define Chk_Prop_Hide 1400 --- 158,161 ---- Index: ProjectGUI.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectGUI.h,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -C2 -d -r1.1.2.7 -r1.1.2.8 *** ProjectGUI.h 26 Mar 2004 02:26:55 -0000 1.1.2.7 --- ProjectGUI.h 28 Mar 2004 03:08:08 -0000 1.1.2.8 *************** *** 42,51 **** ProjectGUI(const PalmDBInfo &projectInfo_); ! void open(void); ! void rename(void); ! void destroy(void); ! void duplicate(void); ! void beam(void); ! void properties(void); static Error create(ProjectGUI &createdProject); --- 42,51 ---- ProjectGUI(const PalmDBInfo &projectInfo_); ! Error open(void); ! Error rename(void); ! Error destroy(void); ! Error duplicate(void); ! Error beam(void); ! Error properties(void); static Error create(ProjectGUI &createdProject); Index: ProjectGUI.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectGUI.cc,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -C2 -d -r1.1.2.7 -r1.1.2.8 *** ProjectGUI.cc 27 Mar 2004 01:16:37 -0000 1.1.2.7 --- ProjectGUI.cc 28 Mar 2004 03:08:08 -0000 1.1.2.8 *************** *** 34,37 **** --- 34,38 ---- #include "ChooseNameForm.h" #include "PalmDBInfo.h" + #include "progectRsc.h" ProjectGUI::ProjectGUI(const PalmDBInfo &projectInfo_):Project(projectInfo_) *************** *** 54,91 **** } ! void ProjectGUI::open(void) { ! // +++ REMOVE THIS +++ ! ErrFatalDisplay( "Open Project" ); ! // +++ REMOVE THIS +++ } ! void ProjectGUI::rename(void) { ! renameProject(selectProjectName(projectInfo)); } ! void ProjectGUI::destroy(void) { ! deleteProject(); } ! void ProjectGUI::duplicate(void) { ! duplicateProject(selectProjectName(projectInfo)); } ! void ProjectGUI::beam(void) { ! // +++ REMOVE THIS +++ ! ErrFatalDisplay( "Beam Project" ); ! // +++ REMOVE THIS +++ } ! void ProjectGUI::properties(void) { ! // +++ REMOVE THIS +++ ! ErrFatalDisplay( "Properties Project" ); ! // +++ REMOVE THIS +++ } --- 55,86 ---- } ! Error ProjectGUI::open(void) { ! return Error(errNone,AltNotImplemented); } ! Error ProjectGUI::rename(void) { ! return renameProject(selectProjectName(projectInfo)); } ! Error ProjectGUI::destroy(void) { ! return deleteProject(); } ! Error ProjectGUI::duplicate(void) { ! return duplicateProject(selectProjectName(projectInfo)); } ! Error ProjectGUI::beam(void) { ! return Error(errNone,AltNotImplemented); } ! Error ProjectGUI::properties(void) { ! return Error(errNone,AltNotImplemented); } |
|
From: Rick P. <ric...@us...> - 2004-03-28 02:41:00
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5293 Modified Files: Tag: OBJECT_INTERNALS_BRANCH ProjectList.cc Log Message: Fixed an off by one error that I introduced last time. Index: ProjectList.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectList.cc,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -C2 -d -r1.1.2.10 -r1.1.2.11 *** ProjectList.cc 27 Mar 2004 03:42:12 -0000 1.1.2.10 --- ProjectList.cc 28 Mar 2004 02:29:47 -0000 1.1.2.11 *************** *** 95,99 **** // make sure that we don't have a name that is too long ErrFatalDisplayIf(dbNew.getName().StrLen()+1 > sizeof(currentEntry->databaseName),"ProjectList::renameProject:dbNew name is too long."); ! DmWrite(currentEntry, OffsetOf(ProjectListDB::ProjectListEntry, databaseName), dbNew.getName(), dbNew.getName().StrLen()+1); UInt16 cardNumber=dbNew.getCardNumber(); DmWrite(currentEntry, OffsetOf(ProjectListDB::ProjectListEntry, cardNumber), &cardNumber, sizeof(UInt16)); --- 95,99 ---- // make sure that we don't have a name that is too long ErrFatalDisplayIf(dbNew.getName().StrLen()+1 > sizeof(currentEntry->databaseName),"ProjectList::renameProject:dbNew name is too long."); ! DmWrite(currentEntry, OffsetOf(ProjectListDB::ProjectListEntry, databaseName), dbNew.getName(), dbNew.getName().StrLen()); UInt16 cardNumber=dbNew.getCardNumber(); DmWrite(currentEntry, OffsetOf(ProjectListDB::ProjectListEntry, cardNumber), &cardNumber, sizeof(UInt16)); |
|
From: Rick P. <ric...@us...> - 2004-03-27 13:57:40
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24578 Modified Files: Tag: OBJECT_INTERNALS_BRANCH String.cc String.h Log Message: Removed some redunancy in String, untested. Index: String.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/String.cc,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** String.cc 27 Mar 2004 13:38:49 -0000 1.1.2.5 --- String.cc 27 Mar 2004 13:46:27 -0000 1.1.2.6 *************** *** 45,58 **** return *this; // x = x ! if (capacity < s.length + 1) ! { ! delete [] internalString; ! capacity = s.capacity; ! internalString = new Char[capacity]; ! } ! ! length = s.length; ! ! ::StrCopy(internalString,s.internalString); return *this; --- 45,49 ---- return *this; // x = x ! copyFromCharPtr(s.internalString,s.length); return *this; *************** *** 96,102 **** } ! void String::copyFromCharPtr(const Char *s,UInt16 bytes) { ! UInt16 stringSize=bytes+1; if (capacity < stringSize) --- 87,93 ---- } ! void String::copyFromCharPtr(const Char *s,UInt16 charCount) { ! UInt16 stringSize=charCount+1; if (capacity < stringSize) *************** *** 109,114 **** length = stringSize; ! ::StrNCopy(internalString,s,bytes); ! internalString[bytes]=0; } --- 100,105 ---- length = stringSize; ! ::StrNCopy(internalString,s,charCount); ! internalString[charCount]=0; } Index: String.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/String.h,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -C2 -d -r1.1.2.6 -r1.1.2.7 *** String.h 27 Mar 2004 13:38:49 -0000 1.1.2.6 --- String.h 27 Mar 2004 13:46:27 -0000 1.1.2.7 *************** *** 83,87 **** protected: ! void copyFromCharPtr(const Char *s,UInt16 bytes); private: --- 83,87 ---- protected: ! void copyFromCharPtr(const Char *s,UInt16 charCount); private: |
|
From: Rick P. <ric...@us...> - 2004-03-27 13:50:33
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23106 Modified Files: Tag: OBJECT_INTERNALS_BRANCH String.cc String.h Log Message: String can now load resource strings, untested. Index: String.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/String.cc,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** String.cc 24 Mar 2004 05:10:03 -0000 1.1.2.4 --- String.cc 27 Mar 2004 13:38:49 -0000 1.1.2.5 *************** *** 96,99 **** --- 96,132 ---- } + void String::copyFromCharPtr(const Char *s,UInt16 bytes) + { + UInt16 stringSize=bytes+1; + + if (capacity < stringSize) + { + delete [] internalString; + capacity = stringSize; + internalString = new Char[capacity]; + } + + length = stringSize; + + ::StrNCopy(internalString,s,bytes); + internalString[bytes]=0; + } + + void String::loadString(DmResID stringToLoad) + { + + MemHandle h1; + Char *p1; + + h1 = DmGetResource('tSTR', stringToLoad); + p1 = static_cast<Char *>(MemHandleLock(h1)); + + copyFromCharPtr(p1,::StrLen(p1)); + + MemHandleUnlock(h1); + DmReleaseResource(h1); + + } + // string3 = string1 + string2 string3 = operator+(string1,string2) String operator+(const String& string1, const String& string2) Index: String.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/String.h,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** String.h 25 Mar 2004 03:10:02 -0000 1.1.2.5 --- String.h 27 Mar 2004 13:38:49 -0000 1.1.2.6 *************** *** 80,83 **** --- 80,88 ---- } + void loadString(DmResID stringToLoad); + + protected: + void copyFromCharPtr(const Char *s,UInt16 bytes); + private: UInt16 length; |
|
From: Rick P. <ric...@us...> - 2004-03-27 13:49:07
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22962 Modified Files: Tag: OBJECT_INTERNALS_BRANCH ProjectListForm.cc Log Message: Style formatting change. Index: ProjectListForm.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectListForm.cc,v retrieving revision 1.1.2.21 retrieving revision 1.1.2.22 diff -C2 -d -r1.1.2.21 -r1.1.2.22 *** ProjectListForm.cc 27 Mar 2004 03:42:12 -0000 1.1.2.21 --- ProjectListForm.cc 27 Mar 2004 13:37:32 -0000 1.1.2.22 *************** *** 131,135 **** case Btn_List_New: newProject(); ! tableHandler->syncTable(); break; default: --- 131,135 ---- case Btn_List_New: newProject(); ! tableHandler->syncTable(); break; default: *************** *** 143,151 **** // the rest of the menus require a selection to be present if (!tableHandler->tableHasSelection()) ! { ! Error error(errNone,StrErrSelectProject); ! error.showErrorToUser(); return false; ! } // reset handled, so the simpler logic works --- 143,151 ---- // the rest of the menus require a selection to be present if (!tableHandler->tableHasSelection()) ! { ! Error error(errNone,StrErrSelectProject); ! error.showErrorToUser(); return false; ! } // reset handled, so the simpler logic works *************** *** 165,182 **** case MenuMainPreferences: projectProperties(selected); ! tableHandler->syncTable(); break; case MenuProjectListRename: case Btn_List_Rename: renameProject(selected); ! tableHandler->syncTable(); break; case MenuProjectListDuplicate: duplicateProject(selected); ! tableHandler->syncTable(); break; case MenuProjectListDelete: deleteProject(selected); ! tableHandler->syncTable(); break; default: --- 165,182 ---- case MenuMainPreferences: projectProperties(selected); ! tableHandler->syncTable(); break; case MenuProjectListRename: case Btn_List_Rename: renameProject(selected); ! tableHandler->syncTable(); break; case MenuProjectListDuplicate: duplicateProject(selected); ! tableHandler->syncTable(); break; case MenuProjectListDelete: deleteProject(selected); ! tableHandler->syncTable(); break; default: |
|
From: Rick P. <ric...@us...> - 2004-03-27 04:26:13
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6106 Modified Files: Tag: OBJECT_INTERNALS_BRANCH PalmForm.h Log Message: Moved another class to UISECT with no obvious ill effects, still have no real idea what was wrong with the other code I moved into UISECT. Index: PalmForm.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/PalmForm.h,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -C2 -d -r1.1.2.7 -r1.1.2.8 *** PalmForm.h 17 Mar 2004 01:22:15 -0000 1.1.2.7 --- PalmForm.h 27 Mar 2004 04:15:10 -0000 1.1.2.8 *************** *** 23,26 **** --- 23,28 ---- #define __UI_PALMFORM_H__ + #include "sections.h" + namespace bwinton { *************** *** 34,46 **** { public: ! PalmForm( UInt16 _formID ); ! PalmForm( const PalmForm& _rhs ); ! virtual ~PalmForm( void ); ! PalmForm& operator=( const PalmForm& _rhs ); ! virtual void load( void ); ! virtual void open( void ); ! virtual void close( void ); virtual Boolean handleEvent( EventPtr _event ) = 0; virtual Boolean doCommand(UInt16 command) --- 36,48 ---- { public: ! PalmForm( UInt16 _formID ) UISECT; ! PalmForm( const PalmForm& _rhs ) UISECT; ! virtual ~PalmForm( void ) UISECT; ! PalmForm& operator=( const PalmForm& _rhs ) UISECT; ! virtual void load( void ) UISECT; ! virtual void open( void ) UISECT; ! virtual void close( void ) UISECT; virtual Boolean handleEvent( EventPtr _event ) = 0; virtual Boolean doCommand(UInt16 command) *************** *** 49,54 **** }; ! FormPtr getForm( void ); ! UInt16 getFormId( void ); // --- 51,56 ---- }; ! FormPtr getForm( void ) UISECT; ! UInt16 getFormId( void ) UISECT; // |
|
From: Rick P. <ric...@us...> - 2004-03-27 03:53:16
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32728 Modified Files: Tag: OBJECT_INTERNALS_BRANCH Project.cc ProjectList.cc ProjectListForm.cc progect.rcp progectRsc.h Log Message: Fixed a problem in ProjectList.cc where it was not properly copying the renamed project name. Added code so that if someone asked Progect to do something that required a selection, and nothing was selected, it would complain with an error window. Index: Project.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/Project.cc,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -C2 -d -r1.1.2.11 -r1.1.2.12 *** Project.cc 27 Mar 2004 01:16:37 -0000 1.1.2.11 --- Project.cc 27 Mar 2004 03:42:12 -0000 1.1.2.12 *************** *** 38,42 **** Project::Project(const PalmDBInfo &newInfo_):projectInfo(newInfo_),dbOpen(false) { ! ErrFatalDisplayIf(newInfo_.getName().StrLen() >= dmDBNameLength,"Project::Project:ProjectName length too long."); } --- 38,42 ---- Project::Project(const PalmDBInfo &newInfo_):projectInfo(newInfo_),dbOpen(false) { ! ErrFatalDisplayIf(newInfo_.getName().StrLen()+1 >= dmDBNameLength,"Project::Project:ProjectName length too long."); } *************** *** 45,49 **** UInt16 cardNumber = projectInfo.getCardNumber(); String databaseName=gPrepend+projectInfo.getName(); ! ErrFatalDisplayIf(databaseName.StrLen() > dmDBNameLength,"Project::createProject:databaseName is too long."); LocalID dbID = DmFindDatabase(cardNumber, databaseName); --- 45,49 ---- UInt16 cardNumber = projectInfo.getCardNumber(); String databaseName=gPrepend+projectInfo.getName(); ! ErrFatalDisplayIf(databaseName.StrLen()+1 > dmDBNameLength,"Project::createProject:databaseName is too long."); LocalID dbID = DmFindDatabase(cardNumber, databaseName); *************** *** 75,83 **** UInt16 cardNumberOrig = projectInfo.getCardNumber(); String databaseNameOrig=gPrepend+projectInfo.getName(); ! ErrFatalDisplayIf(databaseNameOrig.StrLen() > dmDBNameLength,"Project::createProject:databaseNameOrig is too long."); UInt16 cardNumberNew = newInfo.getCardNumber(); String databaseNameNew=gPrepend+newInfo.getName(); ! ErrFatalDisplayIf(databaseNameNew.StrLen() > dmDBNameLength,"Project::createProject:databaseNameNew is too long."); // find the database --- 75,83 ---- UInt16 cardNumberOrig = projectInfo.getCardNumber(); String databaseNameOrig=gPrepend+projectInfo.getName(); ! ErrFatalDisplayIf(databaseNameOrig.StrLen()+1 > dmDBNameLength,"Project::createProject:databaseNameOrig is too long."); UInt16 cardNumberNew = newInfo.getCardNumber(); String databaseNameNew=gPrepend+newInfo.getName(); ! ErrFatalDisplayIf(databaseNameNew.StrLen()+1 > dmDBNameLength,"Project::createProject:databaseNameNew is too long."); // find the database *************** *** 104,108 **** UInt16 cardNumber = newInfo.getCardNumber(); String databaseName=gPrepend+newInfo.getName(); ! ErrFatalDisplayIf(databaseName.StrLen() > dmDBNameLength,"Project::createProject:databaseName is too long."); LocalID dbID = DmFindDatabase(cardNumber, databaseName); --- 104,108 ---- UInt16 cardNumber = newInfo.getCardNumber(); String databaseName=gPrepend+newInfo.getName(); ! ErrFatalDisplayIf(databaseName.StrLen()+1 > dmDBNameLength,"Project::createProject:databaseName is too long."); LocalID dbID = DmFindDatabase(cardNumber, databaseName); Index: ProjectList.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectList.cc,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -C2 -d -r1.1.2.9 -r1.1.2.10 *** ProjectList.cc 26 Mar 2004 02:26:55 -0000 1.1.2.9 --- ProjectList.cc 27 Mar 2004 03:42:12 -0000 1.1.2.10 *************** *** 84,88 **** findEntry.cardNumber=dbOld.getCardNumber(); ! SafeCopy(findEntry.databaseName,dbOld.getName(),dbOld.getName().StrLen()); if (dbHandler->findInSortedDatabase(dbHandler->getDBRef(),::CompareProjectEntryByCardProjectName,&findEntry,&recordNumber)) --- 84,88 ---- findEntry.cardNumber=dbOld.getCardNumber(); ! SafeCopy(findEntry.databaseName,dbOld.getName(),sizeof(findEntry.databaseName)); if (dbHandler->findInSortedDatabase(dbHandler->getDBRef(),::CompareProjectEntryByCardProjectName,&findEntry,&recordNumber)) *************** *** 94,99 **** // make sure that we don't have a name that is too long ! ErrFatalDisplayIf(dbNew.getName().StrLen() > sizeof(currentEntry->databaseName),"ProjectList::renameProject:dbNew name is too long."); ! DmWrite(currentEntry, OffsetOf(ProjectListDB::ProjectListEntry, databaseName), dbNew.getName(), dbNew.getName().StrLen()); UInt16 cardNumber=dbNew.getCardNumber(); DmWrite(currentEntry, OffsetOf(ProjectListDB::ProjectListEntry, cardNumber), &cardNumber, sizeof(UInt16)); --- 94,99 ---- // make sure that we don't have a name that is too long ! ErrFatalDisplayIf(dbNew.getName().StrLen()+1 > sizeof(currentEntry->databaseName),"ProjectList::renameProject:dbNew name is too long."); ! DmWrite(currentEntry, OffsetOf(ProjectListDB::ProjectListEntry, databaseName), dbNew.getName(), dbNew.getName().StrLen()+1); UInt16 cardNumber=dbNew.getCardNumber(); DmWrite(currentEntry, OffsetOf(ProjectListDB::ProjectListEntry, cardNumber), &cardNumber, sizeof(UInt16)); Index: progect.rcp =================================================================== RCS file: /cvsroot/progect/progect/progect.rcp,v retrieving revision 1.66.4.2 retrieving revision 1.66.4.3 diff -C2 -d -r1.66.4.2 -r1.66.4.3 *** progect.rcp 8 Mar 2004 19:38:45 -0000 1.66.4.2 --- progect.rcp 27 Mar 2004 03:42:12 -0000 1.66.4.3 *************** *** 516,519 **** --- 516,520 ---- STRING StrAllDoneTasksInThisView "all done tasks in this view" STRING StrSelectTask "You must first select a task to do this." + STRING StrErrSelectProject "You must first select a project to do this." STRING StrLinkMasterIsNotAvailable "LinkMaster is not available." STRING StrLinkInfoNotFound "LinkInfo not found." Index: progectRsc.h =================================================================== RCS file: /cvsroot/progect/progect/progectRsc.h,v retrieving revision 1.31.6.2 retrieving revision 1.31.6.3 diff -C2 -d -r1.31.6.2 -r1.31.6.3 *** progectRsc.h 26 Mar 2004 21:44:28 -0000 1.31.6.2 --- progectRsc.h 27 Mar 2004 03:42:12 -0000 1.31.6.3 *************** *** 156,159 **** --- 156,160 ---- // Error Strings + #define StrErrSelectProject 1023 // check boxes Index: ProjectListForm.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectListForm.cc,v retrieving revision 1.1.2.20 retrieving revision 1.1.2.21 diff -C2 -d -r1.1.2.20 -r1.1.2.21 *** ProjectListForm.cc 27 Mar 2004 02:24:45 -0000 1.1.2.20 --- ProjectListForm.cc 27 Mar 2004 03:42:12 -0000 1.1.2.21 *************** *** 131,134 **** --- 131,135 ---- case Btn_List_New: newProject(); + tableHandler->syncTable(); break; default: *************** *** 142,146 **** --- 143,151 ---- // the rest of the menus require a selection to be present if (!tableHandler->tableHasSelection()) + { + Error error(errNone,StrErrSelectProject); + error.showErrorToUser(); return false; + } // reset handled, so the simpler logic works *************** *** 160,173 **** --- 165,182 ---- case MenuMainPreferences: projectProperties(selected); + tableHandler->syncTable(); break; case MenuProjectListRename: case Btn_List_Rename: renameProject(selected); + tableHandler->syncTable(); break; case MenuProjectListDuplicate: duplicateProject(selected); + tableHandler->syncTable(); break; case MenuProjectListDelete: deleteProject(selected); + tableHandler->syncTable(); break; default: |
|
From: Rick P. <ric...@us...> - 2004-03-27 03:29:01
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29045 Modified Files: Tag: OBJECT_INTERNALS_BRANCH FormManager.cc FormManager.h PalmForm.cc Log Message: Fixed some problems caused by the movement of stuff into sections. Evidently the main application needs to call a function in the main segment, but the other calls worked out just fine. I don't understand why this is so, but the code seems to work now. Index: PalmForm.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/PalmForm.cc,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -C2 -d -r1.1.2.9 -r1.1.2.10 *** PalmForm.cc 27 Mar 2004 02:24:45 -0000 1.1.2.9 --- PalmForm.cc 27 Mar 2004 03:17:58 -0000 1.1.2.10 *************** *** 111,120 **** case menuEvent: ! handled = doCommand( event_->data.menu.itemID ); break; case ctlSelectEvent: ! handled = doCommand(event_->data.ctlSelect.controlID); ! break; default: --- 111,120 ---- case menuEvent: ! handled = doCommand( event_->data.menu.itemID ); break; case ctlSelectEvent: ! handled = doCommand(event_->data.ctlSelect.controlID); ! break; default: Index: FormManager.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/FormManager.cc,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -C2 -d -r1.1.2.10 -r1.1.2.11 *** FormManager.cc 17 Mar 2004 01:22:15 -0000 1.1.2.10 --- FormManager.cc 27 Mar 2004 03:17:58 -0000 1.1.2.11 *************** *** 32,37 **** { - static FormManagerPtr instance = NULL; - /** * Default constructor. --- 32,35 ---- *************** *** 138,141 **** --- 136,141 ---- {} + FormManagerPtr FormManager::instance=NULL; + } } // bwinton::ui Namespace. Index: FormManager.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/FormManager.h,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -C2 -d -r1.1.2.9 -r1.1.2.10 *** FormManager.h 27 Mar 2004 01:16:25 -0000 1.1.2.9 --- FormManager.h 27 Mar 2004 03:17:58 -0000 1.1.2.10 *************** *** 45,49 **** FormManager( void ) UISECT; FormManager( const PalmForm& _rhs ) UISECT; ! ~FormManager( void ) UISECT; FormManager& operator=( const FormManager& _rhs ) UISECT; --- 45,49 ---- FormManager( void ) UISECT; FormManager( const PalmForm& _rhs ) UISECT; ! ~FormManager( void ); FormManager& operator=( const FormManager& _rhs ) UISECT; *************** *** 52,56 **** void popForm( void ) UISECT; ! Boolean handleFormEvent( EventPtr _event ) UISECT; PalmFormPtr getTopForm( void ) --- 52,56 ---- void popForm( void ) UISECT; ! Boolean handleFormEvent( EventPtr _event ); PalmFormPtr getTopForm( void ) *************** *** 59,64 **** }; ! static FormManagerPtr getInstance( void ) UISECT; ! static void freeInstance( void ) UISECT; void functionToPutInSection(void) UISECT; --- 59,64 ---- }; ! static FormManagerPtr getInstance( void ); ! static void freeInstance( void ); void functionToPutInSection(void) UISECT; *************** *** 66,69 **** --- 66,70 ---- SimpleDeque open_forms; SimpleDeque closed_forms; + static FormManagerPtr instance; }; |
|
From: Rick P. <ric...@us...> - 2004-03-27 02:35:47
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20975 Modified Files: Tag: OBJECT_INTERNALS_BRANCH PalmForm.cc ProjectListForm.cc Log Message: Buttons should now be handled in the ProjecListForm. None of this new code is tested at all. Index: PalmForm.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/PalmForm.cc,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -C2 -d -r1.1.2.8 -r1.1.2.9 *** PalmForm.cc 17 Mar 2004 01:22:15 -0000 1.1.2.8 --- PalmForm.cc 27 Mar 2004 02:24:45 -0000 1.1.2.9 *************** *** 111,117 **** case menuEvent: ! handled = doCommand( event_->data.menu.itemID ); break; default: handled = handleEvent( event_ ); --- 111,121 ---- case menuEvent: ! handled = doCommand( event_->data.menu.itemID ); break; + case ctlSelectEvent: + handled = doCommand(event_->data.ctlSelect.controlID); + break; + default: handled = handleEvent( event_ ); Index: ProjectListForm.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectListForm.cc,v retrieving revision 1.1.2.19 retrieving revision 1.1.2.20 diff -C2 -d -r1.1.2.19 -r1.1.2.20 *** ProjectListForm.cc 20 Mar 2004 19:52:01 -0000 1.1.2.19 --- ProjectListForm.cc 27 Mar 2004 02:24:45 -0000 1.1.2.20 *************** *** 129,132 **** --- 129,133 ---- break; case MenuProjectListNew: + case Btn_List_New: newProject(); break; *************** *** 151,154 **** --- 152,156 ---- { case MenuProjectListOpen: + case Btn_List_Open: openProject(selected); break; *************** *** 160,163 **** --- 162,166 ---- break; case MenuProjectListRename: + case Btn_List_Rename: renameProject(selected); break; |
|
From: Rick P. <ric...@us...> - 2004-03-27 01:27:40
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10099 Modified Files: Tag: OBJECT_INTERNALS_BRANCH FormManager.h Project.cc Project.h ProjectGUI.cc Log Message: Project::renameProject should now be finished. Had to move some stuff to the UISECT because we ran out of space. Index: FormManager.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/FormManager.h,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -C2 -d -r1.1.2.8 -r1.1.2.9 *** FormManager.h 17 Mar 2004 01:22:15 -0000 1.1.2.8 --- FormManager.h 27 Mar 2004 01:16:25 -0000 1.1.2.9 *************** *** 43,56 **** { public: ! FormManager( void ); ! FormManager( const PalmForm& _rhs ); ! ~FormManager( void ); ! FormManager& operator=( const FormManager& _rhs ); ! void pushForm( PalmFormPtr _form ); ! void popForm( void ); ! Boolean handleFormEvent( EventPtr _event ); PalmFormPtr getTopForm( void ) --- 43,56 ---- { public: ! FormManager( void ) UISECT; ! FormManager( const PalmForm& _rhs ) UISECT; ! ~FormManager( void ) UISECT; ! FormManager& operator=( const FormManager& _rhs ) UISECT; ! void pushForm( PalmFormPtr _form ) UISECT; ! void popForm( void ) UISECT; ! Boolean handleFormEvent( EventPtr _event ) UISECT; PalmFormPtr getTopForm( void ) *************** *** 59,64 **** }; ! static FormManagerPtr getInstance( void ); ! static void freeInstance( void ); void functionToPutInSection(void) UISECT; --- 59,64 ---- }; ! static FormManagerPtr getInstance( void ) UISECT; ! static void freeInstance( void ) UISECT; void functionToPutInSection(void) UISECT; Index: Project.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/Project.cc,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -C2 -d -r1.1.2.10 -r1.1.2.11 *** Project.cc 26 Mar 2004 21:44:28 -0000 1.1.2.10 --- Project.cc 27 Mar 2004 01:16:37 -0000 1.1.2.11 *************** *** 36,40 **** #include "ProjectList.h" ! Project::Project(const PalmDBInfo &newInfo_):projectInfo(newInfo_) { ErrFatalDisplayIf(newInfo_.getName().StrLen() >= dmDBNameLength,"Project::Project:ProjectName length too long."); --- 36,40 ---- #include "ProjectList.h" ! Project::Project(const PalmDBInfo &newInfo_):projectInfo(newInfo_),dbOpen(false) { ErrFatalDisplayIf(newInfo_.getName().StrLen() >= dmDBNameLength,"Project::Project:ProjectName length too long."); *************** *** 100,104 **** } ! Error Project::createProject(const PalmDBInfo &newInfo,Project &newProject) { UInt16 cardNumber = newInfo.getCardNumber(); --- 100,104 ---- } ! Error Project::createProject(const PalmDBInfo &newInfo) { UInt16 cardNumber = newInfo.getCardNumber(); *************** *** 143,144 **** --- 143,287 ---- return Error(); } + + Error Project::openProject(UInt16 mode) + { + ErrFatalDisplayIf(dbOpen,"Project::openProject:dbOpen is true"); + + // +++ FIX THIS +++ + ErrFatalDisplay("Project::openProject:not implemented"); + return Error(); + } + + Error Project::duplicateProject(const PalmDBInfo &newInfo) + { + /* + Char src[dmDBNameLength]; + Char dbname[dmDBNameLength]; + UInt16 recNum; + LocalID newID, oldID; + DmOpenRef newDB, oldDB; + MemHandle hOld, hNew; + TaskRecordType *pOld, *pNew; + UInt16 i; + UInt16 index; + UInt16 cardNo = 0; + UInt16 oldAttr, newAttr; + LocalID appInfoID; + Err err; + MemPtr oldP, newP; + */ + Error error; + + // create the destination project + error =createProject(newInfo); + if (error.error()) + return error; + + // open created project + Project createdProject(newInfo); + error = createdProject.openProject(dmModeReadWrite); + if (error.error()) + return error; + + // open ourselves + error = openProject(); + if (error.error()) + return error; + + + // number of records in *this database + UInt16 numRecords = size(); + + // copy each record (except task0) + UInt16 maxRecordIndex; + MemHandle hOld; + MemHandle hNew; + UInt16 oldAttr; + UInt16 newAttr; + TaskRecordType *pOld; + TaskRecordType *pNew; + for (UInt16 i = 1; i < numRecords; i++) + { + maxRecordIndex = dmMaxRecordIndex; + hOld = DmQueryRecord(getDBRef(), i); + pOld = static_cast<TaskRecordType*>(MemHandleLock(hOld)); + hNew = DmNewRecord(createdProject.getDBRef(), &maxRecordIndex, MemPtrSize(pOld)); + if (!hNew) + { + error = Error(DmGetLastErr(),StrNoMemorySpaces); + return error; + } + + pNew = static_cast<TaskRecordType*>(MemHandleLock(hNew)); + DmWrite(pNew, 0, pOld, MemPtrSize(pOld)); + MemHandleUnlock(hNew); + MemHandleUnlock(hOld); + DmReleaseRecord(createdProject.getDBRef(), maxRecordIndex, true); + + // get category + DmRecordInfo(getDBRef(), i, &oldAttr, NULL, NULL); + DmRecordInfo(createdProject.getDBRef(), i, &newAttr, NULL, NULL); + newAttr &= ~dmRecAttrCategoryMask; // remove category info + oldAttr &= dmRecAttrCategoryMask; // keep only category info + newAttr |= oldAttr; // get old category + // set it to the new record + DmSetRecordInfo(createdProject.getDBRef(), maxRecordIndex, &newAttr, NULL); + } + + // copy appInfo block + LocalID appInfoID = DmGetAppInfoID(getDBRef()); + MemPtr oldP = MemLocalIDToLockedPtr(appInfoID, 0); + + hNew = DmNewHandle(createdProject.getDBRef(), MemPtrSize(oldP)); + if (!hNew) + { + error = Error(DmGetLastErr(),StrNoMemorySpaces); + MemPtrUnlock(oldP); + return error; + } + else + { + appInfoID = MemHandleToLocalID(hNew); + if (!appInfoID) + { + MemPtrUnlock(oldP); + MemHandleFree(hNew); + return Error(DmGetLastErr()); + } + + LocalID newID=createdProject.getLocalID(); + if (!newID) + { + MemPtrUnlock(oldP); + MemHandleFree(hNew); + return Error(DmGetLastErr()); + } + + DmSetDatabaseInfo(0, newID, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + &appInfoID, NULL, NULL, NULL); + + MemPtr newP = MemLocalIDToLockedPtr(appInfoID, 0); + DmWrite(newP, 0, oldP, MemPtrSize(oldP)); + + MemPtrUnlock(oldP); + MemPtrUnlock(newP); + } + + return error; + } + + DmOpenRef Project::getDBRef(void) + { + ErrFatalDisplayIf(!dbOpen,"Project::size:dbOpen is false"); + return dbOpenRef; + } + + UInt16 Project::size(void) + { + return DmNumRecords(getDBRef()); + } + + LocalID Project::getLocalID(void) + { + return DmFindDatabase(projectInfo.getCardNumber(),projectInfo.getName()); + } Index: Project.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/Project.h,v retrieving revision 1.1.2.10 retrieving revision 1.1.2.11 diff -C2 -d -r1.1.2.10 -r1.1.2.11 *** Project.h 26 Mar 2004 21:44:28 -0000 1.1.2.10 --- Project.h 27 Mar 2004 01:16:37 -0000 1.1.2.11 *************** *** 35,42 **** { public: ! Project() {} ; Project(const PalmDBInfo &newName_); String getName(void) { --- 35,44 ---- { public: ! Project():dbOpen(false) {} ; + Project(const PalmDBInfo &newName_); + String getName(void) { *************** *** 60,79 **** ; Error renameProject(const PalmDBInfo &newInfo); Error Project::deleteProject(void); ! void duplicateProject(const PalmDBInfo &newName) ! { ! ErrFatalDisplay("Project::deleteProject"); ! } ! ; ! static Error createProject(const PalmDBInfo &newInfo_,Project &newProject_); // getTaskIterator(); // or whatever we do to grab an iterator protected: PalmDBInfo projectInfo; }; --- 62,86 ---- ; + Error openProject(UInt16 mode=dmModeReadOnly); + Error renameProject(const PalmDBInfo &newInfo); Error Project::deleteProject(void); ! Error duplicateProject(const PalmDBInfo &newName); ! static Error createProject(const PalmDBInfo &createdProject); + UInt16 size(void); // getTaskIterator(); // or whatever we do to grab an iterator protected: + DmOpenRef getDBRef(void); + LocalID getLocalID(); + + protected: PalmDBInfo projectInfo; + Boolean dbOpen; + DmOpenRef dbOpenRef; }; Index: ProjectGUI.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectGUI.cc,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -C2 -d -r1.1.2.6 -r1.1.2.7 *** ProjectGUI.cc 26 Mar 2004 02:26:55 -0000 1.1.2.6 --- ProjectGUI.cc 27 Mar 2004 01:16:37 -0000 1.1.2.7 *************** *** 40,46 **** Error ProjectGUI::create(ProjectGUI &createdProject) { ! PalmDBInfo projectInfo; ! Error error=Project::createProject(selectProjectName(projectInfo),createdProject); if (error.error()) --- 40,50 ---- Error ProjectGUI::create(ProjectGUI &createdProject) { ! PalmDBInfo newProjectInfo; ! newProjectInfo=selectProjectName(newProjectInfo); ! ! Error error=Project::createProject(newProjectInfo); ! ! createdProject=newProjectInfo; if (error.error()) |
|
From: Rick P. <ric...@us...> - 2004-03-26 21:55:29
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2042 Modified Files: Tag: OBJECT_INTERNALS_BRANCH Error.h Project.cc Project.h progectRsc.h Log Message: Modified how Error works a bit, in particular, it doesn't take a string argument anymore, but a resource ID for the string in the resource database that represents the error. Glad I caught that one when I did... The project class now renames as well as deletes. Index: Project.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/Project.h,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -C2 -d -r1.1.2.9 -r1.1.2.10 *** Project.h 26 Mar 2004 02:26:55 -0000 1.1.2.9 --- Project.h 26 Mar 2004 21:44:28 -0000 1.1.2.10 *************** *** 60,73 **** ; ! void renameProject(const PalmDBInfo &newName) ! { ! ErrFatalDisplay("Project::renameProject"); ! } ! ; ! void deleteProject(void) ! { ! ErrFatalDisplay("Project::deleteProject"); ! } ! ; void duplicateProject(const PalmDBInfo &newName) { --- 60,67 ---- ; ! Error renameProject(const PalmDBInfo &newInfo); ! ! Error Project::deleteProject(void); ! void duplicateProject(const PalmDBInfo &newName) { Index: Error.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/Error.h,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** Error.h 26 Mar 2004 02:26:55 -0000 1.1.2.2 --- Error.h 26 Mar 2004 21:44:28 -0000 1.1.2.3 *************** *** 33,44 **** { public: ! Error():palmOSError(errNone),hasError(false) ! {} ! ; ! Error( const String &errorDescription_,Err palmOSError_ = errNone):ErrorDescription(errorDescription_),palmOSError(palmOSError_),hasError(true) ! {} ! ; ! Error(Err palmOSError_):palmOSError(palmOSError_),hasError(true) ! {} ; Boolean error(void) --- 33,40 ---- { public: ! Error(const Err palmOSError_=errNone, const UInt16 errorResourceString_=0):errorResourceString(errorResourceString_),palmOSError(palmOSError_) ! { ! hasError = (palmOSError_ != errNone); ! } ; Boolean error(void) *************** *** 49,53 **** private: ! String ErrorDescription; Err palmOSError; Boolean hasError; --- 45,49 ---- private: ! UInt16 errorResourceString; Err palmOSError; Boolean hasError; Index: progectRsc.h =================================================================== RCS file: /cvsroot/progect/progect/progectRsc.h,v retrieving revision 1.31.6.1 retrieving revision 1.31.6.2 diff -C2 -d -r1.31.6.1 -r1.31.6.2 *** progectRsc.h 19 Feb 2004 22:15:57 -0000 1.31.6.1 --- progectRsc.h 26 Mar 2004 21:44:28 -0000 1.31.6.2 *************** *** 155,158 **** --- 155,160 ---- #define StrDBVersionIncorrect 1022 + // Error Strings + // check boxes #define Chk_Prop_Hide 1400 Index: Project.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/Project.cc,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -C2 -d -r1.1.2.9 -r1.1.2.10 *** Project.cc 26 Mar 2004 02:26:55 -0000 1.1.2.9 --- Project.cc 26 Mar 2004 21:44:28 -0000 1.1.2.10 *************** *** 27,31 **** #include "util.h" ! //#include "progectRsc.h" #include "progect.h" --- 27,31 ---- #include "util.h" ! #include "progectRsc.h" #include "progect.h" *************** *** 41,62 **** } ! Error Project::createProject(const PalmDBInfo &newInfo_,Project &newProject) { ! /* ! ErrFatalDisplay("Project::createProject"); ! UInt16 cardNo = 0; ! Char dbname[dmDBNameLength]; ! Err Err = errNone; ! LocalID dbID; ! TaskType task0; ! UInt16 index = 0; ! UInt16 dbversion = DBVERSION; ! UInt16 attr; ! ! SafeCopy(dbname,nameP,dmDBNameLength); ! Prepend(dbname); ! */ ! UInt16 cardNumber = newInfo_.getCardNumber(); ! String databaseName=gPrepend+newInfo_.getName(); ErrFatalDisplayIf(databaseName.StrLen() > dmDBNameLength,"Project::createProject:databaseName is too long."); --- 41,107 ---- } ! Error Project::deleteProject(void) { ! UInt16 cardNumber = projectInfo.getCardNumber(); ! String databaseName=gPrepend+projectInfo.getName(); ! ErrFatalDisplayIf(databaseName.StrLen() > dmDBNameLength,"Project::createProject:databaseName is too long."); ! ! LocalID dbID = DmFindDatabase(cardNumber, databaseName); ! if (!dbID) ! return Error(DmGetLastErr()); ! ! // if database exists, delete it ! Err err = errNone; ! UInt32 creatorID; ! DmDatabaseInfo(cardNumber, dbID, NULL, NULL, NULL, NULL, NULL, ! NULL, NULL, NULL, NULL, NULL, &creatorID); ! if (creatorID == CREATOR) ! err = DmDeleteDatabase(cardNumber, dbID); ! ! // ! // Update project list model ! // ! if (errNone == err) ! { ! ProjectList projectList; ! projectList.deleteProject(projectInfo); ! } ! ! return Error(err); ! } ! ! Error Project::renameProject(const PalmDBInfo &newInfo) ! { ! UInt16 cardNumberOrig = projectInfo.getCardNumber(); ! String databaseNameOrig=gPrepend+projectInfo.getName(); ! ErrFatalDisplayIf(databaseNameOrig.StrLen() > dmDBNameLength,"Project::createProject:databaseNameOrig is too long."); ! ! UInt16 cardNumberNew = newInfo.getCardNumber(); ! String databaseNameNew=gPrepend+newInfo.getName(); ! ErrFatalDisplayIf(databaseNameNew.StrLen() > dmDBNameLength,"Project::createProject:databaseNameNew is too long."); ! ! // find the database ! LocalID dbID = DmFindDatabase(cardNumberOrig, databaseNameOrig); ! if (!dbID) ! return Error(DmGetLastErr()); ! ! Err err = DmSetDatabaseInfo(cardNumberNew, dbID, databaseNameNew, NULL, NULL, NULL, NULL, ! NULL, NULL, NULL, NULL, NULL, NULL); ! // ! // Update the project list model ! // ! if (errNone == err) ! { ! ProjectList projectList; ! projectList.renameProject(projectInfo,newInfo); ! } ! ! return Error(err); ! } ! ! Error Project::createProject(const PalmDBInfo &newInfo,Project &newProject) ! { ! UInt16 cardNumber = newInfo.getCardNumber(); ! String databaseName=gPrepend+newInfo.getName(); ErrFatalDisplayIf(databaseName.StrLen() > dmDBNameLength,"Project::createProject:databaseName is too long."); *************** *** 94,98 **** ProjectList projectList; ! projectList.addProject(newInfo_); return Error(); --- 139,143 ---- ProjectList projectList; ! projectList.addProject(newInfo); return Error(); |
|
From: Rick P. <ric...@us...> - 2004-03-26 02:37:50
|
Update of /cvsroot/progect/progect In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3040 Modified Files: Tag: OBJECT_INTERNALS_BRANCH Error.cc Error.h Project.cc Project.h ProjectGUI.cc ProjectGUI.h ProjectList.cc ProjectList.h ProjectListDB.cc ProjectListDB.h ProjectListForm.h ProjectListRS.cc ProjectListRS.h Log Message: Did a make style, that accounts for almost every file in the list. Changed ProjectList so that it keeps a reference counted ProjectListDB object around, and uses the object as a handler. This is so that we can create a ProjectList whenever we need to to access the project list without colliding on the open database call. This accounts for the ProjectList* files. This code is untested, but should work. Index: Project.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/Project.h,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -C2 -d -r1.1.2.8 -r1.1.2.9 *** Project.h 25 Mar 2004 23:07:40 -0000 1.1.2.8 --- Project.h 26 Mar 2004 02:26:55 -0000 1.1.2.9 *************** *** 35,39 **** { public: ! Project(){}; Project(const PalmDBInfo &newName_); String getName(void) --- 35,41 ---- { public: ! Project() ! {} ! ; Project(const PalmDBInfo &newName_); String getName(void) *************** *** 74,78 **** ; ! static Error createProject(const PalmDBInfo &newInfo_,Project &newProject_); // getTaskIterator(); // or whatever we do to grab an iterator --- 76,80 ---- ; ! static Error createProject(const PalmDBInfo &newInfo_,Project &newProject_); // getTaskIterator(); // or whatever we do to grab an iterator Index: Error.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/Error.h,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Error.h 25 Mar 2004 23:07:40 -0000 1.1.2.1 --- Error.h 26 Mar 2004 02:26:55 -0000 1.1.2.2 *************** *** 37,52 **** ; Error( const String &errorDescription_,Err palmOSError_ = errNone):ErrorDescription(errorDescription_),palmOSError(palmOSError_),hasError(true) ! { ! }; Error(Err palmOSError_):palmOSError(palmOSError_),hasError(true) { }; ! Boolean error(void){return hasError;}; ! void showErrorToUser(void); private: String ErrorDescription; ! Err palmOSError; ! Boolean hasError; }; --- 37,55 ---- ; Error( const String &errorDescription_,Err palmOSError_ = errNone):ErrorDescription(errorDescription_),palmOSError(palmOSError_),hasError(true) ! {} ! ; Error(Err palmOSError_):palmOSError(palmOSError_),hasError(true) + {} + ; + Boolean error(void) { + return hasError; }; ! void showErrorToUser(void); private: String ErrorDescription; ! Err palmOSError; ! Boolean hasError; }; Index: ProjectGUI.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectGUI.cc,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** ProjectGUI.cc 25 Mar 2004 23:07:40 -0000 1.1.2.5 --- ProjectGUI.cc 26 Mar 2004 02:26:55 -0000 1.1.2.6 *************** *** 42,51 **** PalmDBInfo projectInfo; ! Error error=Project::createProject(selectProjectName(projectInfo),createdProject); ! if (error.error()) ! error.showErrorToUser(); ! ! return error; } --- 42,51 ---- PalmDBInfo projectInfo; ! Error error=Project::createProject(selectProjectName(projectInfo),createdProject); ! if (error.error()) ! error.showErrorToUser(); ! ! return error; } Index: ProjectListForm.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectListForm.h,v retrieving revision 1.1.2.15 retrieving revision 1.1.2.16 diff -C2 -d -r1.1.2.15 -r1.1.2.16 *** ProjectListForm.h 25 Mar 2004 23:07:40 -0000 1.1.2.15 --- ProjectListForm.h 26 Mar 2004 02:26:55 -0000 1.1.2.16 *************** *** 51,60 **** void newProject(void) { ! ProjectGUI createdProject; ! Error error = ProjectGUI::create(createdProject); ! ! if (!error.error()) ! createdProject.open(); }; void beamProject(ProjectGUI &theProject) --- 51,60 ---- void newProject(void) { ! ProjectGUI createdProject; ! Error error = ProjectGUI::create(createdProject); ! ! if (!error.error()) ! createdProject.open(); }; void beamProject(ProjectGUI &theProject) Index: ProjectListRS.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectListRS.h,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** ProjectListRS.h 20 Mar 2004 19:52:01 -0000 1.1.2.3 --- ProjectListRS.h 26 Mar 2004 02:26:55 -0000 1.1.2.4 *************** *** 37,42 **** Boolean seekRecord(UInt16 * indexP, Int16 offset, Int16 direction) { ! return ProjectListDB::seekRecord(indexP,offset,direction); }; Drawable& getDrawable(void) { --- 37,43 ---- Boolean seekRecord(UInt16 * indexP, Int16 offset, Int16 direction) { ! return ProjectList::seekRecord(indexP,offset,direction); }; + Drawable& getDrawable(void) { Index: Error.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/Error.cc,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Error.cc 25 Mar 2004 23:07:40 -0000 1.1.2.1 --- Error.cc 26 Mar 2004 02:26:55 -0000 1.1.2.2 *************** *** 30,34 **** void Error::showErrorToUser(void) { ! ErrFatalDisplay("Error::showErrorToUser:Currently not implemented, however there was an error you need to know about."); } --- 30,34 ---- void Error::showErrorToUser(void) { ! ErrFatalDisplay("Error::showErrorToUser:Currently not implemented, however there was an error you need to know about."); } Index: ProjectListDB.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectListDB.cc,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** ProjectListDB.cc 20 Mar 2004 15:38:17 -0000 1.1.2.4 --- ProjectListDB.cc 26 Mar 2004 02:26:55 -0000 1.1.2.5 *************** *** 1,4 **** /* -*-Mode:C; tab-width:4; indent-tabs-mode:t; c-file-style:"stroustrup";-*- */ ! /* Main code for Project */ #include <PalmOS.h> --- 1,26 ---- /* -*-Mode:C; tab-width:4; indent-tabs-mode:t; c-file-style:"stroustrup";-*- */ ! // FILE: ProjectListDB.cc -- ! // AUTHOR: Rick Price <ric...@us...> ! // DATE: 15 February 2004 ! ! // Copyright (C) 2004 Price <ric...@us...> ! // All rights reserved. ! // ! // This program is free software; you can redistribute it and/or modify ! // it under the terms of the GNU General Public License as published by ! // the Free Software Foundation; either version 2 of the License, or ! // (at your option) any later version. ! // ! // This program is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with this program; if not, write to the Free Software ! // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! ! // ========================== ================================================= ! #include <PalmOS.h> Index: ProjectListDB.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectListDB.h,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** ProjectListDB.h 20 Mar 2004 19:52:01 -0000 1.1.2.5 --- ProjectListDB.h 26 Mar 2004 02:26:55 -0000 1.1.2.6 *************** *** 82,85 **** --- 82,86 ---- // constants static const UInt16 cardNumber=0; + friend class ProjectList; }; Index: Project.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/Project.cc,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -C2 -d -r1.1.2.8 -r1.1.2.9 *** Project.cc 25 Mar 2004 23:07:40 -0000 1.1.2.8 --- Project.cc 26 Mar 2004 02:26:55 -0000 1.1.2.9 *************** *** 43,99 **** Error Project::createProject(const PalmDBInfo &newInfo_,Project &newProject) { ! /* ! ErrFatalDisplay("Project::createProject"); ! UInt16 cardNo = 0; ! Char dbname[dmDBNameLength]; ! Err Err = errNone; ! LocalID dbID; ! TaskType task0; ! UInt16 index = 0; ! UInt16 dbversion = DBVERSION; ! UInt16 attr; ! ! SafeCopy(dbname,nameP,dmDBNameLength); ! Prepend(dbname); ! */ ! UInt16 cardNumber = newInfo_.getCardNumber(); ! String databaseName=gPrepend+newInfo_.getName(); ErrFatalDisplayIf(databaseName.StrLen() > dmDBNameLength,"Project::createProject:databaseName is too long."); ! LocalID dbID = DmFindDatabase(cardNumber, databaseName); ! if (dbID) ! return Error(dmErrAlreadyExists); ! Err err = DmCreateDatabase(cardNumber, databaseName, CREATOR, 'DATA', false); ! dbID = DmFindDatabase(cardNumber, databaseName); ! if (!dbID) ! return Error(err); ! // make sure db is backed up ! UInt16 attr; ! DmDatabaseInfo(0, dbID, NULL, &attr, NULL, NULL, NULL, ! NULL, NULL, NULL, NULL, NULL, NULL); ! attr = attr | dmHdrAttrBackup; ! // set database format version & attributes ! UInt16 dbversion = DBVERSION; ! DmSetDatabaseInfo(cardNumber, dbID, NULL, &attr, &dbversion, NULL, NULL, ! NULL, NULL, NULL, NULL, NULL, NULL); ! // +++ FIX THIS +++ ! /* ! // Need to create the initial record for some reason ! // OpenDB takes a name without prepend ! OpenDB(cardNumber,nameP, &gdbP); ! task0 = gEmptyTask; ! AddRecord(gdbP, &task0, &index); ! CloseDB(gdbP); ! gdbP = NULL; ! */ ! // +++ FIX THIS +++ ! ProjectList projectList; ! projectList.addProject(newInfo_); ! return Error(); } --- 43,99 ---- Error Project::createProject(const PalmDBInfo &newInfo_,Project &newProject) { ! /* ! ErrFatalDisplay("Project::createProject"); ! UInt16 cardNo = 0; ! Char dbname[dmDBNameLength]; ! Err Err = errNone; ! LocalID dbID; ! TaskType task0; ! UInt16 index = 0; ! UInt16 dbversion = DBVERSION; ! UInt16 attr; ! ! SafeCopy(dbname,nameP,dmDBNameLength); ! Prepend(dbname); ! */ ! UInt16 cardNumber = newInfo_.getCardNumber(); ! String databaseName=gPrepend+newInfo_.getName(); ErrFatalDisplayIf(databaseName.StrLen() > dmDBNameLength,"Project::createProject:databaseName is too long."); ! LocalID dbID = DmFindDatabase(cardNumber, databaseName); ! if (dbID) ! return Error(dmErrAlreadyExists); ! Err err = DmCreateDatabase(cardNumber, databaseName, CREATOR, 'DATA', false); ! dbID = DmFindDatabase(cardNumber, databaseName); ! if (!dbID) ! return Error(err); ! // make sure db is backed up ! UInt16 attr; ! DmDatabaseInfo(0, dbID, NULL, &attr, NULL, NULL, NULL, ! NULL, NULL, NULL, NULL, NULL, NULL); ! attr = attr | dmHdrAttrBackup; ! // set database format version & attributes ! UInt16 dbversion = DBVERSION; ! DmSetDatabaseInfo(cardNumber, dbID, NULL, &attr, &dbversion, NULL, NULL, ! NULL, NULL, NULL, NULL, NULL, NULL); ! // +++ FIX THIS +++ ! /* ! // Need to create the initial record for some reason ! // OpenDB takes a name without prepend ! OpenDB(cardNumber,nameP, &gdbP); ! task0 = gEmptyTask; ! AddRecord(gdbP, &task0, &index); ! CloseDB(gdbP); ! gdbP = NULL; ! */ ! // +++ FIX THIS +++ ! ProjectList projectList; ! projectList.addProject(newInfo_); ! return Error(); } Index: ProjectList.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectList.cc,v retrieving revision 1.1.2.8 retrieving revision 1.1.2.9 diff -C2 -d -r1.1.2.8 -r1.1.2.9 *** ProjectList.cc 25 Mar 2004 03:10:02 -0000 1.1.2.8 --- ProjectList.cc 26 Mar 2004 02:26:55 -0000 1.1.2.9 *************** *** 1,4 **** /* -*-Mode:C; tab-width:4; indent-tabs-mode:t; c-file-style:"stroustrup";-*- */ ! /* Main code for Project */ #include <PalmOS.h> --- 1,26 ---- /* -*-Mode:C; tab-width:4; indent-tabs-mode:t; c-file-style:"stroustrup";-*- */ ! // FILE: ProjectList.cc -- ! // AUTHOR: Rick Price <ric...@us...> ! // DATE: 15 February 2004 ! ! // Copyright (C) 2004 Price <ric...@us...> ! // All rights reserved. ! // ! // This program is free software; you can redistribute it and/or modify ! // it under the terms of the GNU General Public License as published by ! // the Free Software Foundation; either version 2 of the License, or ! // (at your option) any later version. ! // ! // This program is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with this program; if not, write to the Free Software ! // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! ! // ========================== ================================================= ! #include <PalmOS.h> *************** *** 9,20 **** #include "util.h" #include "ProjectList.h" #include "ProjectGUI.h" #include "PalmDBInfo.h" ProjectGUI ProjectList::getRecord(UInt16 index) { ! const ProjectListEntry* dbRecordStruct=ProjectListDB::getRecord(index); ! ProjectListEntry privateCopy = *dbRecordStruct; ! MemPtrUnlock(const_cast<ProjectListEntry*>(dbRecordStruct)); return ProjectGUI(PalmDBInfo(privateCopy.cardNumber,privateCopy.databaseName)); --- 31,59 ---- #include "util.h" #include "ProjectList.h" + #include "ProjectListDB.h" #include "ProjectGUI.h" #include "PalmDBInfo.h" + ProjectList::ProjectList() + { + if (refCounter++) + return; + + dbHandler = new ProjectListDB(); + } + + ProjectList::~ProjectList() + { + if (--refCounter) + return; + + delete dbHandler; + } + ProjectGUI ProjectList::getRecord(UInt16 index) { ! const ProjectListDB::ProjectListEntry* dbRecordStruct=dbHandler->getRecord(index); ! ProjectListDB::ProjectListEntry privateCopy = *dbRecordStruct; ! MemPtrUnlock(const_cast<ProjectListDB::ProjectListEntry*>(dbRecordStruct)); return ProjectGUI(PalmDBInfo(privateCopy.cardNumber,privateCopy.databaseName)); *************** *** 25,36 **** { UInt16 recordNumber; ! ProjectListEntry newEntry; newEntry.cardNumber=newInfo_.getCardNumber(); SafeCopy(newEntry.databaseName,newInfo_.getName(),sizeof(newEntry.databaseName)); ! updateAddProjectModelEntry(&newEntry); ! if (findInSortedDatabase(getDBRef(),::CompareProjectEntryByCardProjectName,&newEntry,&recordNumber)) ! setRecordCategory(recordNumber,getCurrentCategory()); } --- 64,75 ---- { UInt16 recordNumber; ! ProjectListDB::ProjectListEntry newEntry; newEntry.cardNumber=newInfo_.getCardNumber(); SafeCopy(newEntry.databaseName,newInfo_.getName(),sizeof(newEntry.databaseName)); ! dbHandler->updateAddProjectModelEntry(&newEntry); ! if (dbHandler->findInSortedDatabase(dbHandler->getDBRef(),::CompareProjectEntryByCardProjectName,&newEntry,&recordNumber)) ! dbHandler->setRecordCategory(recordNumber,dbHandler->getCurrentCategory()); } *************** *** 39,44 **** UInt16 recordNumber; UInt16 category; ! ProjectListEntry findEntry; ! ProjectListEntry *currentEntry; MemHandle currentEntryHandle; --- 78,83 ---- UInt16 recordNumber; UInt16 category; ! ProjectListDB::ProjectListEntry findEntry; ! ProjectListDB::ProjectListEntry *currentEntry; MemHandle currentEntryHandle; *************** *** 47,68 **** SafeCopy(findEntry.databaseName,dbOld.getName(),dbOld.getName().StrLen()); ! if (findInSortedDatabase(getDBRef(),::CompareProjectEntryByCardProjectName,&findEntry,&recordNumber)) { ! category=getRecordCategory(recordNumber); ! DmDetachRecord(getDBRef(),recordNumber,¤tEntryHandle); ! currentEntry=static_cast<ProjectListEntry*>(MemHandleLock(currentEntryHandle)); ErrFatalDisplayIf(NULL==currentEntry,"ProjectList::RenameProject:Unable to rename project."); // make sure that we don't have a name that is too long ErrFatalDisplayIf(dbNew.getName().StrLen() > sizeof(currentEntry->databaseName),"ProjectList::renameProject:dbNew name is too long."); ! DmWrite(currentEntry, OffsetOf(ProjectListEntry, databaseName), dbNew.getName(), dbNew.getName().StrLen()); UInt16 cardNumber=dbNew.getCardNumber(); ! DmWrite(currentEntry, OffsetOf(ProjectListEntry, cardNumber), &cardNumber, sizeof(UInt16)); ! if(!findInSortedDatabase(getDBRef(),::CompareProjectEntryByCardProjectName,currentEntry,&recordNumber)) { MemPtrUnlock(currentEntry); ! DmAttachRecord(getDBRef(),&recordNumber,currentEntryHandle,NULL); ! setRecordCategory(recordNumber,category); } else --- 86,107 ---- SafeCopy(findEntry.databaseName,dbOld.getName(),dbOld.getName().StrLen()); ! if (dbHandler->findInSortedDatabase(dbHandler->getDBRef(),::CompareProjectEntryByCardProjectName,&findEntry,&recordNumber)) { ! category=dbHandler->getRecordCategory(recordNumber); ! DmDetachRecord(dbHandler->getDBRef(),recordNumber,¤tEntryHandle); ! currentEntry=static_cast<ProjectListDB::ProjectListEntry*>(MemHandleLock(currentEntryHandle)); ErrFatalDisplayIf(NULL==currentEntry,"ProjectList::RenameProject:Unable to rename project."); // make sure that we don't have a name that is too long ErrFatalDisplayIf(dbNew.getName().StrLen() > sizeof(currentEntry->databaseName),"ProjectList::renameProject:dbNew name is too long."); ! DmWrite(currentEntry, OffsetOf(ProjectListDB::ProjectListEntry, databaseName), dbNew.getName(), dbNew.getName().StrLen()); UInt16 cardNumber=dbNew.getCardNumber(); ! DmWrite(currentEntry, OffsetOf(ProjectListDB::ProjectListEntry, cardNumber), &cardNumber, sizeof(UInt16)); ! if(!dbHandler->findInSortedDatabase(dbHandler->getDBRef(),::CompareProjectEntryByCardProjectName,currentEntry,&recordNumber)) { MemPtrUnlock(currentEntry); ! DmAttachRecord(dbHandler->getDBRef(),&recordNumber,currentEntryHandle,NULL); ! dbHandler->setRecordCategory(recordNumber,category); } else *************** *** 77,87 **** { UInt16 recordNumber; ! ProjectListEntry newEntry; newEntry.cardNumber=toDelete.getCardNumber(); SafeCopy(newEntry.databaseName,toDelete.getName(),sizeof(newEntry.databaseName)); ! if (findInSortedDatabase(getDBRef(),::CompareProjectEntryByCardProjectName,&newEntry,&recordNumber)) ! DmRemoveRecord(getDBRef(),recordNumber); } --- 116,126 ---- { UInt16 recordNumber; ! ProjectListDB::ProjectListEntry newEntry; newEntry.cardNumber=toDelete.getCardNumber(); SafeCopy(newEntry.databaseName,toDelete.getName(),sizeof(newEntry.databaseName)); ! if (dbHandler->findInSortedDatabase(dbHandler->getDBRef(),::CompareProjectEntryByCardProjectName,&newEntry,&recordNumber)) ! DmRemoveRecord(dbHandler->getDBRef(),recordNumber); } *************** *** 89,99 **** { UInt16 recordNumber; ! ProjectListEntry newEntry; newEntry.cardNumber=db.getCardNumber(); SafeCopy(newEntry.databaseName,db.getName(),sizeof(newEntry.databaseName)); ! if (findInSortedDatabase(getDBRef(),::CompareProjectEntryByCardProjectName,&newEntry,&recordNumber)) ! return getRecordCategory(recordNumber); return dmUnfiledCategory; --- 128,138 ---- { UInt16 recordNumber; ! ProjectListDB::ProjectListEntry newEntry; newEntry.cardNumber=db.getCardNumber(); SafeCopy(newEntry.databaseName,db.getName(),sizeof(newEntry.databaseName)); ! if (dbHandler->findInSortedDatabase(dbHandler->getDBRef(),::CompareProjectEntryByCardProjectName,&newEntry,&recordNumber)) ! return dbHandler->getRecordCategory(recordNumber); return dmUnfiledCategory; *************** *** 104,108 **** { UInt16 recordNumber; ! ProjectListEntry newEntry; --- 143,147 ---- { UInt16 recordNumber; ! ProjectListDB::ProjectListEntry newEntry; *************** *** 110,114 **** SafeCopy(newEntry.databaseName,db.getName(),sizeof(newEntry.databaseName)); ! if (findInSortedDatabase(getDBRef(),::CompareProjectEntryByCardProjectName,&newEntry,&recordNumber)) ! setRecordCategory(recordNumber,newCategory); } --- 149,156 ---- SafeCopy(newEntry.databaseName,db.getName(),sizeof(newEntry.databaseName)); ! if (dbHandler->findInSortedDatabase(dbHandler->getDBRef(),::CompareProjectEntryByCardProjectName,&newEntry,&recordNumber)) ! dbHandler->setRecordCategory(recordNumber,newCategory); } + + ProjectListDB *ProjectList::dbHandler=NULL; + UInt16 ProjectList::refCounter=0; Index: ProjectList.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectList.h,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -C2 -d -r1.1.2.9 -r1.1.2.10 *** ProjectList.h 25 Mar 2004 03:10:02 -0000 1.1.2.9 --- ProjectList.h 26 Mar 2004 02:26:55 -0000 1.1.2.10 *************** *** 33,40 **** #include "PalmDBInfo.h" ! class ProjectList : public ProjectListDB { public: ProjectGUI getRecord(UInt16 index); --- 33,51 ---- #include "PalmDBInfo.h" ! class ProjectList { public: + ProjectList(); + ~ProjectList(); + ProjectGUI getRecord(UInt16 index); + void updateProjectList(void) + { + dbHandler->updateProjectList(); + }; + Boolean seekRecord(UInt16 * indexP, Int16 offset, Int16 direction) + { + return dbHandler->seekRecord(indexP,offset,direction); + }; *************** *** 48,51 **** --- 59,65 ---- UInt16 getProjectCategory(const PalmDBInfo &db); void setProjectCategory(const PalmDBInfo &db, UInt16 newCategory); + + static ProjectListDB *dbHandler; + static UInt16 refCounter; }; Index: ProjectListRS.cc =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectListRS.cc,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -C2 -d -r1.1.2.4 -r1.1.2.5 *** ProjectListRS.cc 24 Mar 2004 05:10:02 -0000 1.1.2.4 --- ProjectListRS.cc 26 Mar 2004 02:26:55 -0000 1.1.2.5 *************** *** 1,5 **** /* -*-Mode:C; tab-width:4; indent-tabs-mode:t; c-file-style:"stroustrup";-*- */ ! /* Main code for Project */ ! //#define ERROR_CHECK_LEVEL 2 #include <PalmOS.h> --- 1,26 ---- /* -*-Mode:C; tab-width:4; indent-tabs-mode:t; c-file-style:"stroustrup";-*- */ ! // FILE: ProjectListRS.cc -- ! // AUTHOR: Rick Price <ric...@us...> ! // DATE: 15 February 2004 ! ! // Copyright (C) 2004 Price <ric...@us...> ! // All rights reserved. ! // ! // This program is free software; you can redistribute it and/or modify ! // it under the terms of the GNU General Public License as published by ! // the Free Software Foundation; either version 2 of the License, or ! // (at your option) any later version. ! // ! // This program is distributed in the hope that it will be useful, ! // but WITHOUT ANY WARRANTY; without even the implied warranty of ! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! // GNU General Public License for more details. ! // ! // You should have received a copy of the GNU General Public License ! // along with this program; if not, write to the Free Software ! // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! ! // ========================== ================================================= ! #include <PalmOS.h> Index: ProjectGUI.h =================================================================== RCS file: /cvsroot/progect/progect/Attic/ProjectGUI.h,v retrieving revision 1.1.2.6 retrieving revision 1.1.2.7 diff -C2 -d -r1.1.2.6 -r1.1.2.7 *** ProjectGUI.h 25 Mar 2004 23:07:40 -0000 1.1.2.6 --- ProjectGUI.h 26 Mar 2004 02:26:55 -0000 1.1.2.7 *************** *** 35,39 **** { public: ! ProjectGUI(){} ProjectGUI(const Project &project_):Project(project_) {} --- 35,40 ---- { public: ! ProjectGUI() ! {} ProjectGUI(const Project &project_):Project(project_) {} *************** *** 47,51 **** void beam(void); void properties(void); ! static Error create(ProjectGUI &createdProject); static PalmDBInfo selectProjectName(const PalmDBInfo &defaultName); --- 48,52 ---- void beam(void); void properties(void); ! static Error create(ProjectGUI &createdProject); static PalmDBInfo selectProjectName(const PalmDBInfo &defaultName); |
