From 7b2729153a14c01063ae0348c50e10b66fd070d4 Mon Sep 17 00:00:00 2001 From: Harbour Date: Tue, 25 Dec 2007 05:04:39 +0200 Subject: [PATCH] . --- faraon/x11_ui.C | 28 ++++++++++++++++++++++------ faraon/x11_ui.H | 2 ++ faraon/x11_ui.fl | 39 ++++++++++++++++++++++++++++----------- faraon/x11_ui.po | 32 ++++++++++++++++++++------------ 4 files changed, 72 insertions(+), 29 deletions(-) diff --git a/faraon/x11_ui.C b/faraon/x11_ui.C index 7213bc2..1da4f89 100644 --- a/faraon/x11_ui.C +++ b/faraon/x11_ui.C @@ -395,6 +395,15 @@ Fl_Scroll_Resize *select_slice_tree_scroll=(Fl_Scroll_Resize *)0; Fl_Output *select_slice_status_to=(Fl_Output *)0; +Fl_Choice *select_object_type_ch=(Fl_Choice *)0; + +Fl_Menu_Item menu_select_object_type_ch[] = { + {gettext("Slice"), 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0}, + {gettext("File"), 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0}, + {gettext("Note"), 0, 0, 0, 0, FL_NORMAL_LABEL, 0, 14, 0}, + {0,0,0,0,0,0,0,0,0} +}; + Fl_Double_Window *slices_w=(Fl_Double_Window *)0; static void cb_Cancel2(Fl_Button*, void*) { @@ -2754,13 +2763,13 @@ void x11_ui::init() { } // Fl_Group* config_confirmation_gr preferences_w->end(); } // Fl_Double_Window* preferences_w - { select_slice_w = new Fl_Double_Window(730, 370, gettext("Select Sfinx Slice")); + { select_slice_w = new Fl_Double_Window(730, 370, gettext("Select Sfinx Object")); select_slice_w->color((Fl_Color)31); { Fl_Button* o = new Fl_Button(594, 312, 112, 25, gettext("Cancel")); o->labeltype(FL_ENGRAVED_LABEL); o->callback((Fl_Callback*)cb_Cancel1); } // Fl_Button* o - { select_slice_b = new Fl_Button(21, 312, 542, 25, gettext("Select slice")); + { select_slice_b = new Fl_Button(21, 312, 312, 25, gettext("Select")); select_slice_b->labeltype(FL_ENGRAVED_LABEL); select_slice_b->callback((Fl_Callback*)cb_select_slice_b); } // Fl_Button* select_slice_b @@ -2785,6 +2794,13 @@ void x11_ui::init() { select_slice_status_to->color((Fl_Color)31); select_slice_status_to->deactivate(); } // Fl_Output* select_slice_status_to + { select_object_type_ch = new Fl_Choice(360, 313, 211, 23, gettext("Object Type")); + select_object_type_ch->down_box(FL_BORDER_BOX); + select_object_type_ch->color((Fl_Color)48); + select_object_type_ch->labeltype(FL_ENGRAVED_LABEL); + select_object_type_ch->align(FL_ALIGN_TOP_LEFT); + select_object_type_ch->menu(menu_select_object_type_ch); + } // Fl_Choice* select_object_type_ch select_slice_w->set_modal(); select_slice_w->end(); } // Fl_Double_Window* select_slice_w @@ -3224,24 +3240,24 @@ void x11_ui::init() { { Fl_Box* o = new Fl_Box(535, 72, 467, 227); o->box(FL_ENGRAVED_FRAME); } // Fl_Box* o - { note_main_object_b = new Fl_Button(590, 93, 348, 25, gettext("Main Object (Not Set)")); + { note_main_object_b = new Fl_Button(594, 93, 348, 25, gettext("Main Object Link (Not Set)")); note_main_object_b->tooltip(gettext("File Main Slice")); note_main_object_b->box(FL_PLASTIC_THIN_UP_BOX); note_main_object_b->labeltype(FL_ENGRAVED_LABEL); note_main_object_b->callback((Fl_Callback*)cb_note_main_object_b); } // Fl_Button* note_main_object_b - { note_additional_objects_br = new Fl_Browser(559, 146, 420, 102, gettext("Additional Objects")); + { note_additional_objects_br = new Fl_Browser(559, 146, 420, 102, gettext("Additional Object Tags")); note_additional_objects_br->type(3); note_additional_objects_br->color((Fl_Color)46); note_additional_objects_br->labeltype(FL_ENGRAVED_LABEL); note_additional_objects_br->align(FL_ALIGN_TOP); } // Fl_Browser* note_additional_objects_br - { note_add_object_b = new Fl_Button(584, 258, 138, 25, gettext("Add Object")); + { note_add_object_b = new Fl_Button(584, 258, 138, 25, gettext("Add Link")); note_add_object_b->box(FL_PLASTIC_THIN_UP_BOX); note_add_object_b->labeltype(FL_ENGRAVED_LABEL); note_add_object_b->callback((Fl_Callback*)cb_note_add_object_b); } // Fl_Button* note_add_object_b - { note_remove_object_b = new Fl_Button(811, 258, 138, 25, gettext("Remove Object")); + { note_remove_object_b = new Fl_Button(811, 258, 138, 25, gettext("Remove Link")); note_remove_object_b->box(FL_PLASTIC_THIN_UP_BOX); note_remove_object_b->labeltype(FL_ENGRAVED_LABEL); note_remove_object_b->callback((Fl_Callback*)cb_note_remove_object_b); diff --git a/faraon/x11_ui.H b/faraon/x11_ui.H index c70bf76..3752937 100644 --- a/faraon/x11_ui.H +++ b/faraon/x11_ui.H @@ -34,6 +34,7 @@ extern Fl_Double_Window *select_slice_w; extern Fl_Button *select_slice_b; extern Fl_Scroll_Resize *select_slice_tree_scroll; extern Fl_Output *select_slice_status_to; +extern Fl_Choice *select_object_type_ch; extern Fl_Double_Window *slices_w; extern Fl_Scroll_Resize *slices_tree_scroll; extern Fl_Output *slices_status_to; @@ -99,6 +100,7 @@ extern Fl_Menu_Item menu_[]; extern Fl_Menu_Item menu_Minimum[]; extern Fl_Menu_Item menu_Minimum1[]; extern Fl_Menu_Item menu_Minimum2[]; +extern Fl_Menu_Item menu_select_object_type_ch[]; extern Fl_Menu_Item menu_slice_deletion_type_ch[]; extern Fl_Menu_Item menu_data_deletion_type_ch[]; extern Fl_Menu_Item menu_note_secured_ch[]; diff --git a/faraon/x11_ui.fl b/faraon/x11_ui.fl index 6dbed1f..bf01141 100644 --- a/faraon/x11_ui.fl +++ b/faraon/x11_ui.fl @@ -514,8 +514,8 @@ preferences_w->hide();} } } Fl_Window select_slice_w { - label {Select Sfinx Slice} - xywh {157 449 730 370} type Double color 31 hide modal + label {Select Sfinx Object} + xywh {165 227 730 370} type Double color 31 hide modal } { Fl_Button {} { label Cancel @@ -523,14 +523,14 @@ preferences_w->hide();} xywh {594 312 112 25} labeltype ENGRAVED_LABEL } Fl_Button select_slice_b { - label {Select slice} + label Select callback {Fl_Toggle_Node *node = select_slice_tree->selected(); if (!node) return; selected_slice_id = from_voidp(node->user_data()); void (*select_slice_action)(void) = (void (*)())(select_slice_b->user_data()); select_slice_action();} - xywh {21 312 542 25} labeltype ENGRAVED_LABEL + xywh {21 312 312 25} labeltype ENGRAVED_LABEL } Fl_Scroll select_slice_tree_scroll {open xywh {15 15 702 280} box ENGRAVED_FRAME color 28 @@ -543,6 +543,23 @@ select_slice_action();} Fl_Output select_slice_status_to { xywh {0 349 733 21} box PLASTIC_UP_BOX color 31 deactivate } + Fl_Choice select_object_type_ch { + label {Object Type} + xywh {360 313 211 23} down_box BORDER_BOX color 48 labeltype ENGRAVED_LABEL align 5 + } { + MenuItem {} { + label Slice + xywh {20 20 35 22} + } + MenuItem {} { + label File + xywh {30 30 35 22} + } + MenuItem {} { + label Note + xywh {30 30 35 22} + } + } } Fl_Window slices_w { label {Sfinx Slices} @@ -1205,8 +1222,8 @@ app->sfinx.send(current_files_module_tree_path);*/} } } Fl_Window edit_note_w { - label {Edit Note} selected - xywh {100 300 1020 385} type Double color 31 modal visible + label {Edit Note} + xywh {69 302 1020 385} type Double color 31 hide modal } { Fl_Button {} { label Cancel @@ -1260,25 +1277,25 @@ app->sfinx.send(file);*/} xywh {535 72 467 227} box ENGRAVED_FRAME } Fl_Button note_main_object_b { - label {Main Object (Not Set)} + label {Main Object Link (Not Set)} callback {/*app->sfinx.send(SFINX_SLICES_MODULE_TREE_REQUEST, (u8_t)0); slices_w->user_data((void *)select_file_main_slice_action); slices_w->show();*/} - tooltip {File Main Slice} xywh {590 93 348 25} box PLASTIC_THIN_UP_BOX labeltype ENGRAVED_LABEL + tooltip {File Main Slice} xywh {594 93 348 25} box PLASTIC_THIN_UP_BOX labeltype ENGRAVED_LABEL } Fl_Browser note_additional_objects_br { - label {Additional Objects} + label {Additional Object Tags} selected xywh {559 146 420 102} type Multi color 46 labeltype ENGRAVED_LABEL align 1 } Fl_Button note_add_object_b { - label {Add Object} + label {Add Link} callback {/*app->sfinx.send(SFINX_SLICES_MODULE_TREE_REQUEST, (u8_t)0); slices_w->user_data((void *)select_file_additional_slice_action); slices_w->show();*/} xywh {584 258 138 25} box PLASTIC_THIN_UP_BOX labeltype ENGRAVED_LABEL } Fl_Button note_remove_object_b { - label {Remove Object} + label {Remove Link} callback {for (int i = note_additional_objects_br->size(); i >= 1; i--) { if (note_additional_objects_br->selected(i)) note_additional_objects_br->remove(i); diff --git a/faraon/x11_ui.po b/faraon/x11_ui.po index 6c71fc9..963979f 100644 --- a/faraon/x11_ui.po +++ b/faraon/x11_ui.po @@ -117,12 +117,20 @@ msgid "Detect files MIME type" msgstr "Detect files MIME type" msgid "Exit confirm" msgstr "Exit confirm" -msgid "Select Sfinx Slice" -msgstr "Select Sfinx Slice" +msgid "Select Sfinx Object" +msgstr "Select Sfinx Object" msgid "Cancel" msgstr "Cancel" -msgid "Select slice" -msgstr "Select slice" +msgid "Select" +msgstr "Select" +msgid "Object Type" +msgstr "Object Type" +msgid "Slice" +msgstr "Slice" +msgid "File" +msgstr "File" +msgid "Note" +msgstr "Note" msgid "Sfinx Slices" msgstr "Sfinx Slices" msgid "Cancel" @@ -283,16 +291,16 @@ msgid "Text" msgstr "Text" msgid "Ok" msgstr "Ok" -msgid "Main Object (Not Set)" -msgstr "Main Object (Not Set)" +msgid "Main Object Link (Not Set)" +msgstr "Main Object Link (Not Set)" msgid "File Main Slice" msgstr "File Main Slice" -msgid "Additional Objects" -msgstr "Additional Objects" -msgid "Add Object" -msgstr "Add Object" -msgid "Remove Object" -msgstr "Remove Object" +msgid "Additional Object Tags" +msgstr "Additional Object Tags" +msgid "Add Link" +msgstr "Add Link" +msgid "Remove Link" +msgstr "Remove Link" msgid "Secure Level" msgstr "Secure Level" msgid "None" -- 2.11.4.GIT