Changeset 126 for trunk/NewView/MainForm.pas

Timestamp:

Apr 27, 2007, 8:55:58 PM (18 years ago)

Author:

RBRi

Message:

new toolbar icons

File:

• trunk/NewView/MainForm.pas (modified) (12 diffs)

trunk/NewView/MainForm.pas

@@ -57 +57 @@
 
   MAIN_WINDOW_CLASS_NAME = 'NewViewMainForm';
-
-  PARAM_LINK_NOTE = 'note';
-  PARAM_LINK_PROGRAM = 'program';
-  PARAM_LINK_URL = 'url';
-  PARAM_LINK_EXTERNAL = 'external';
 
 Type
@@ -831 +826 @@
 
   // Library
-//  ACLStringUtility,
   ACLFileIOUtility,
   ACLUtility,
@@ -859 +853 @@
 
   // local: others
+  NewViewConstantsUnit,
   SettingsUnit,
   VersionUnit,
@@ -872 +867 @@
   // Coolbar button indexes
   ciOpen = 0;
-  ciBack = 1;
-  ciForward = 2;
-  ciPrint = 3;
-  ciAddNote = 4;
-  ciAddBookmark = 5;
-  ciPrevious = 6;
-  ciNext = 7;
-  ciGlobalSearch = 8;
+  ciPrint = 1;
+  ciNavigator = 2;
+  ciBack = 3;
+  ciForward = 4;
+  ciAddNote = 5;
+  ciAddBookmark = 6;
+  ciPrevious = 7;
+  ciNext = 8;
+  ciGlobalSearch = 9;
 
   // Page indexes.
@@ -1381 +1377 @@
     // copy menu hints to toolbar hints
     Coolbar.Sections[ ciOpen ].Hint := OpenMI.Hint;
+    Coolbar.Sections[ ciPrint ].Hint := PrintMI.Hint;
+    Coolbar.Sections[ ciNavigator ].Hint := ShowLeftPanelMI.Hint;
     Coolbar.Sections[ ciBack ].Hint := NavigateBackMI.Hint;
     Coolbar.Sections[ ciForward ].Hint := NavigateForwardMI.Hint;
-    Coolbar.Sections[ ciPrint ].Hint := PrintMI.Hint;
     Coolbar.Sections[ ciAddNote ].Hint := AddNoteMI.Hint;
     Coolbar.Sections[ ciAddBookmark ].Hint := AddBookmarkMI.Hint;
@@ -1526 +1523 @@
   Language.LL( Apply, EditNoteMsg, 'EditNoteMsg', 'Click to edit note' );
   Language.LL( Apply, ExternalLinkMsg, 'ExternalLinkMsg', 'Link to another file' );
-  Language.LL( Apply, LinkMsg, 'LinkMsg', 'Link to ' );
+  Language.LL( Apply, LinkMsg, 'LinkMsg', 'Link to' );
   Language.LL( Apply, UnknownLinkMsg, 'UnknownLinkMsg', 'Unknown link' );
   Language.LL( Apply, FootnoteMsg, 'FootnoteMsg', 'Footnote' );
@@ -3179 +3176 @@
     ciOpen:
       FileOpen;
+    ciPrint:
+      PrintTopics;
+    ciNavigator:
+      ShowLeftPanel := not ShowLeftPanel;
     ciBack:
       NavigateBack;
     ciForward:
       NavigateForward;
-    ciPrint:
-      PrintTopics;
     ciAddNote:
       AddNote;
@@ -5413 +5412 @@
 // TODO check param here
 
-    ProgramInfo.readValuesFromSerializedString(StrSubstringFrom(LinkString, Length(PARAM_LINK_PROGRAM) + 1));
+    ProgramInfo.readValuesFromSerializedString(StrSubstringFrom(LinkString, Length(PARAM_LINK_PROGRAM) + 2));
     ProgramPath := ProgramInfo.get(0);
     ProgramLink := ProgramInfo.get(1);
@@ -5423 +5422 @@
   else if StrStartsWith(LinkString, PARAM_LINK_URL) then
   begin
-    URL := StrSubstringFrom( LinkString, 5 );
+    URL := StrSubstringFrom(LinkString, Length(PARAM_LINK_URL) + 2); //
+
     SetStatus( LinkMsg + URL );
   end
   else if StrStartsWith(LinkString, PARAM_LINK_EXTERNAL) then
   begin
-    LinkDetails := StrSubstringFrom(LinkString, 10);
+    LinkDetails := StrSubstringFrom(LinkString, Length(PARAM_LINK_EXTERNAL) + 2);
 
     tmpLinkDetails := TStringList.Create;
@@ -5492 +5492 @@
   if StrStartsWith(LinkString, PARAM_LINK_NOTE) then
   begin
-    NoteIndex := StrToInt(StrSubstringFrom(LinkString, Length(PARAM_LINK_NOTE) + 1) );
+    NoteIndex := StrToInt(StrSubstringFrom(LinkString, Length(PARAM_LINK_NOTE) + 2) );
     NotesListBox.ItemIndex := NoteIndex;
     EditNote( NoteIndex );
@@ -5512 +5512 @@
   else if StrLeft( LinkString, 3 ) = PARAM_LINK_URL then
   begin
-    URL := StrSubstringFrom(LinkString, 5);
+    URL := StrSubstringFrom(LinkString, Length(PARAM_LINK_URL) + 2);
 
     try
@@ -5529 +5529 @@
   else if StrLeft( LinkString, 8 ) = PARAM_LINK_EXTERNAL then
   begin
-    LinkDetails := StrSubstringFrom( LinkString, 10 );
+    LinkDetails := StrSubstringFrom(LinkString, Length(PARAM_LINK_EXTERNAL) + 2);
 
     tmpLinkDetails := TStringList.Create;