[Patch] small Note cleanup

[Martin Vermeer]

Attached. No change in functionality.

OK to go in?

- Martin

-- 
Martin Vermeer  [EMAIL PROTECTED]
Helsinki University of Technology 
Dept. of Surveying, Inst. of Geodesy
P.O. Box 1200, FIN-02015 HUT, Finland
:wq

Index: controllers/ControlNote.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlNote.C,v
retrieving revision 1.2
diff -u -p -r1.2 ControlNote.C
--- controllers/ControlNote.C   30 Jul 2003 21:47:18 -0000      1.2
+++ controllers/ControlNote.C   21 Aug 2003 06:37:15 -0000
@@ -49,7 +49,8 @@ void ControlNote::dispatchParams()
 }
 
 
-void note_gui_tokens(vector<string> & ids, vector<string> & gui_names)
+void note_gui_tokens(vector<string> & ids, vector<string> & gui_names,
+                               string & str)
 {
        char const * const ids_[] = {"Note", "Comment", "Greyedout"};
        size_t const ids_size = sizeof(ids_) / sizeof(char *);
@@ -58,4 +59,8 @@ void note_gui_tokens(vector<string> & id
        gui_names.push_back(_("LyX Note"));
        gui_names.push_back(_("Comment"));
        gui_names.push_back(_("Greyed Out"));
+
+       str = _("Lyx Note: LyX internal only\n"
+               "Comment: Export to LaTeX but don't print\n"
+               "Greyed Out: Print as grey text");
 }
Index: controllers/ControlNote.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlNote.h,v
retrieving revision 1.2
diff -u -p -r1.2 ControlNote.h
--- controllers/ControlNote.h   30 Jul 2003 21:47:18 -0000      1.2
+++ controllers/ControlNote.h   21 Aug 2003 06:37:15 -0000
@@ -42,6 +42,6 @@ private:
 };
 
 ///
-void note_gui_tokens(std::vector<string> &, std::vector<string> &);
+void note_gui_tokens(std::vector<string> &, std::vector<string> &, string &);
 
 #endif // CONTROLNOTE_H
Index: xforms/FormNote.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormNote.C,v
retrieving revision 1.4
diff -u -p -r1.4 FormNote.C
--- xforms/FormNote.C   30 Jul 2003 21:47:18 -0000      1.4
+++ xforms/FormNote.C   21 Aug 2003 06:37:16 -0000
@@ -36,18 +36,13 @@ void FormNote::build()
 {
        dialog_.reset(build_note(this));
 
-       note_gui_tokens(ids_, gui_names_);
+       string str;
+       note_gui_tokens(ids_, gui_names_, str);
 
        for (int i = 0; i < 3; ++i) {   
-       }
-       
-       for (int i = 0; i < 3; ++i) {   
                fl_addto_choice(dialog_->choice_type, gui_names_[i].c_str());
        }
 
-       string str = _("Lyx Note: LyX internal only\n"
-                      "Comment: Export to LaTeX but don't print\n"
-                      "Greyed Out: Print as grey text");
        tooltips().init(dialog_->choice_type, str);
 
        bcview().setOK(dialog_->button_ok);
@@ -60,9 +55,9 @@ void FormNote::update()
 {
        string type(controller().params().type);
        for (int i = 0; i < 3; ++i) {   
-       if (type == ids_[i])
-               fl_set_choice_text(dialog_->choice_type, gui_names_[i].c_str());
-       }
+               if (type == ids_[i])
+                       fl_set_choice_text(dialog_->choice_type, 
gui_names_[i].c_str());
+               }
 }
 
 

pgp00000.pgp
Description: PGP signature