diff --git a/LiteEditor/output_pane.cpp b/LiteEditor/output_pane.cpp index 27f471f1f3..fee55b4858 100644 --- a/LiteEditor/output_pane.cpp +++ b/LiteEditor/output_pane.cpp @@ -120,52 +120,41 @@ void OutputPane::CreateGUIControls() // Build tab m_buildWin = new NewBuildTab(m_book); - m_book->AddPage( - m_buildWin, wxGetTranslation(BUILD_WIN), true, bmpLoader->LoadBitmap(wxT("toolbars/16/build/build"))); - m_tabs.insert(std::make_pair( - wxGetTranslation(BUILD_WIN), - Tab(wxGetTranslation(BUILD_WIN), m_buildWin, bmpLoader->LoadBitmap(wxT("toolbars/16/build/build"))))); + m_book->AddPage(m_buildWin, wxGetTranslation(BUILD_WIN), true, bmpLoader->LoadBitmap(wxT("build"))); + m_tabs.insert(std::make_pair(wxGetTranslation(BUILD_WIN), + Tab(wxGetTranslation(BUILD_WIN), m_buildWin, bmpLoader->LoadBitmap(wxT("build"))))); mgr->AddOutputTab(wxGetTranslation(BUILD_WIN)); // Find in files m_findResultsTab = new FindResultsTab(m_book, wxID_ANY, wxGetTranslation(FIND_IN_FILES_WIN)); - m_book->AddPage(m_findResultsTab, - wxGetTranslation(FIND_IN_FILES_WIN), - false, - bmpLoader->LoadBitmap(wxT("toolbars/16/search/find"))); - m_tabs.insert(std::make_pair(wxGetTranslation(FIND_IN_FILES_WIN), - Tab(wxGetTranslation(FIND_IN_FILES_WIN), - m_findResultsTab, - bmpLoader->LoadBitmap(wxT("toolbars/16/search/find"))))); + m_book->AddPage(m_findResultsTab, wxGetTranslation(FIND_IN_FILES_WIN), false, bmpLoader->LoadBitmap(wxT("find"))); + m_tabs.insert( + std::make_pair(wxGetTranslation(FIND_IN_FILES_WIN), + Tab(wxGetTranslation(FIND_IN_FILES_WIN), m_findResultsTab, bmpLoader->LoadBitmap(wxT("find"))))); mgr->AddOutputTab(wxGetTranslation(FIND_IN_FILES_WIN)); // Replace In Files m_replaceResultsTab = new ReplaceInFilesPanel(m_book, wxID_ANY, wxGetTranslation(REPLACE_IN_FILES)); - m_book->AddPage(m_replaceResultsTab, - wxGetTranslation(REPLACE_IN_FILES), - false, - bmpLoader->LoadBitmap(wxT("toolbars/16/search/find_and_replace"))); + m_book->AddPage( + m_replaceResultsTab, wxGetTranslation(REPLACE_IN_FILES), false, bmpLoader->LoadBitmap(wxT("find_and_replace"))); m_tabs.insert(std::make_pair( - REPLACE_IN_FILES, - Tab(REPLACE_IN_FILES, m_replaceResultsTab, bmpLoader->LoadBitmap(wxT("toolbars/16/search/find_and_replace"))))); + REPLACE_IN_FILES, Tab(REPLACE_IN_FILES, m_replaceResultsTab, bmpLoader->LoadBitmap(wxT("find_and_replace"))))); mgr->AddOutputTab(REPLACE_IN_FILES); // Show Usage ("References") m_showUsageTab = new FindUsageTab(m_book, wxGetTranslation(SHOW_USAGE)); - m_book->AddPage( - m_showUsageTab, wxGetTranslation(SHOW_USAGE), false, bmpLoader->LoadBitmap(wxT("toolbars/16/search/find"))); - m_tabs.insert(std::make_pair( - wxGetTranslation(SHOW_USAGE), - Tab(wxGetTranslation(SHOW_USAGE), m_showUsageTab, bmpLoader->LoadBitmap(wxT("toolbars/16/search/find"))))); + m_book->AddPage(m_showUsageTab, wxGetTranslation(SHOW_USAGE), false, bmpLoader->LoadBitmap(wxT("find"))); + m_tabs.insert( + std::make_pair(wxGetTranslation(SHOW_USAGE), + Tab(wxGetTranslation(SHOW_USAGE), m_showUsageTab, bmpLoader->LoadBitmap(wxT("find"))))); mgr->AddOutputTab(wxGetTranslation(SHOW_USAGE)); // Output tab m_outputWind = new OutputTab(m_book, wxID_ANY, wxGetTranslation(OUTPUT_WIN)); - m_book->AddPage( - m_outputWind, wxGetTranslation(OUTPUT_WIN), false, bmpLoader->LoadBitmap(wxT("output-pane/16/terminal"))); - m_tabs.insert(std::make_pair( - wxGetTranslation(OUTPUT_WIN), - Tab(wxGetTranslation(OUTPUT_WIN), m_outputWind, bmpLoader->LoadBitmap(wxT("output-pane/16/terminal"))))); + m_book->AddPage(m_outputWind, wxGetTranslation(OUTPUT_WIN), false, bmpLoader->LoadBitmap(wxT("terminal"))); + m_tabs.insert( + std::make_pair(wxGetTranslation(OUTPUT_WIN), + Tab(wxGetTranslation(OUTPUT_WIN), m_outputWind, bmpLoader->LoadBitmap(wxT("terminal"))))); mgr->AddOutputTab(wxGetTranslation(OUTPUT_WIN)); #if HAS_LIBCLANG @@ -189,11 +178,10 @@ void OutputPane::CreateGUIControls() // Set the trace's font & colors ///////////////////////////////////// - m_book->AddPage(text, wxGetTranslation(TRACE_TAB), false, wxXmlResource::Get()->LoadBitmap(wxT("debug_window"))); + m_book->AddPage(text, wxGetTranslation(TRACE_TAB), false, bmpLoader->LoadBitmap("log")); m_logTargetOld = wxLog::SetActiveTarget(new wxclTextCtrl(text)); - m_tabs.insert( - std::make_pair(wxGetTranslation(TRACE_TAB), - Tab(wxGetTranslation(TRACE_TAB), text, wxXmlResource::Get()->LoadBitmap(wxT("debug_window"))))); + m_tabs.insert(std::make_pair(wxGetTranslation(TRACE_TAB), + Tab(wxGetTranslation(TRACE_TAB), text, bmpLoader->LoadBitmap("log")))); mgr->AddOutputTab(wxGetTranslation(TRACE_TAB)); // Now that we set up our own log target, re-enable the logging @@ -201,10 +189,9 @@ void OutputPane::CreateGUIControls() // Tasks panel m_taskPanel = new TaskPanel(m_book, wxID_ANY, wxGetTranslation(TASKS)); - m_book->AddPage(m_taskPanel, wxGetTranslation(TASKS), false, bmpLoader->LoadBitmap(wxT("output-pane/16/tasks"))); - m_tabs.insert( - std::make_pair(wxGetTranslation(TASKS), - Tab(wxGetTranslation(TASKS), m_taskPanel, bmpLoader->LoadBitmap(wxT("output-pane/16/tasks"))))); + m_book->AddPage(m_taskPanel, wxGetTranslation(TASKS), false, bmpLoader->LoadBitmap("tasks")); + m_tabs.insert(std::make_pair(wxGetTranslation(TASKS), + Tab(wxGetTranslation(TASKS), m_taskPanel, bmpLoader->LoadBitmap("tasks")))); mgr->AddOutputTab(wxGetTranslation(TASKS)); SetMinSize(wxSize(200, 100)); @@ -222,8 +209,7 @@ void OutputPane::OnEditorFocus(wxCommandEvent& e) return; } - if(m_buildInProgress) - return; + if(m_buildInProgress) return; wxAuiPaneInfo& info = PluginManager::Get()->GetDockingManager()->GetPane(wxT("Output View")); DockablePaneMenuManager::HackHidePane(true, info, PluginManager::Get()->GetDockingManager()); @@ -251,8 +237,7 @@ void OutputPane::SaveTabOrder() clConfig::Get().SetOutputTabOrder(panes, m_book->GetSelection()); } -typedef struct -{ +typedef struct { wxString text; wxWindow* win; wxBitmap bmp; @@ -263,8 +248,7 @@ void OutputPane::ApplySavedTabOrder() const wxArrayString tabs; int index = -1; - if(!clConfig::Get().GetOutputTabOrder(tabs, index)) - return; + if(!clConfig::Get().GetOutputTabOrder(tabs, index)) return; std::vector vTempstore; for(size_t t = 0; t < tabs.GetCount(); ++t) { diff --git a/Runtime/codelite-bitmaps.zip b/Runtime/codelite-bitmaps.zip index e5ed975008..7a0fd77352 100644 Binary files a/Runtime/codelite-bitmaps.zip and b/Runtime/codelite-bitmaps.zip differ diff --git a/Subversion2/subversion2.cpp b/Subversion2/subversion2.cpp index 3bb426a5b6..6da52fe72e 100644 --- a/Subversion2/subversion2.cpp +++ b/Subversion2/subversion2.cpp @@ -467,7 +467,7 @@ void Subversion2::EnsureVisible() void Subversion2::DoInitialize() { - m_svnBitmap = GetManager()->GetStdIcons()->LoadBitmap(wxT("subversion/16/svn")); + m_svnBitmap = GetManager()->GetStdIcons()->LoadBitmap(wxT("subversion")); // create tab (possibly detached) Notebook* book = m_mgr->GetOutputPaneNotebook(); diff --git a/Subversion2/subversion2.wxcp b/Subversion2/subversion2.wxcp index 10cbc9d1ce..201fc9dda0 100644 --- a/Subversion2/subversion2.wxcp +++ b/Subversion2/subversion2.wxcp @@ -9,6 +9,7 @@ "m_outputFileName": "subversion2_ui", "m_firstWindowId": 1000, "m_useEnum": false, + "m_useUnderscoreMacro": true, "m_templateClasses": [] }, "windows": [{ @@ -640,11 +641,11 @@ "m_properties": [{ "type": "string", "m_label": "Size:", - "m_value": "575,315" + "m_value": "-1,-1" }, { "type": "string", "m_label": "Minimum Size:", - "m_value": "" + "m_value": "400,250" }, { "type": "string", "m_label": "Name:", @@ -820,7 +821,7 @@ "gbSpan": ",", "gbPosition": ",", "m_styles": [], - "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_VERTICAL"], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT", "wxALIGN_CENTER_VERTICAL"], "m_properties": [{ "type": "winid", "m_label": "ID:", @@ -939,7 +940,7 @@ }, { "type": "bool", "m_label": "Focused", - "m_value": false + "m_value": true }, { "type": "string", "m_label": "Class Name:", @@ -982,7 +983,7 @@ "gbSpan": ",", "gbPosition": ",", "m_styles": [], - "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_VERTICAL"], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT", "wxALIGN_CENTER_VERTICAL"], "m_properties": [{ "type": "winid", "m_label": "ID:", @@ -1816,7 +1817,7 @@ }, { "type": "bool", "m_label": "Focused", - "m_value": false + "m_value": true }, { "type": "string", "m_label": "Class Name:", @@ -2236,7 +2237,7 @@ }, { "type": "string", "m_label": "Minimum Size:", - "m_value": "" + "m_value": "400,250" }, { "type": "string", "m_label": "Name:", @@ -2496,7 +2497,7 @@ }, { "type": "bitmapPicker", "m_label": "Bitmap File:", - "m_path": "svn-icons/general.png" + "m_path": "../bitmaps/16-cog.png" }, { "type": "bool", "m_label": "Selected", @@ -2661,12 +2662,12 @@ "m_children": [] }, { "m_type": 4406, - "proportion": 1, + "proportion": 0, "border": 5, "gbSpan": ",", "gbPosition": ",", "m_styles": [], - "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_CENTER_VERTICAL"], "m_properties": [{ "type": "winid", "m_label": "ID:", @@ -2710,7 +2711,7 @@ }, { "type": "bool", "m_label": "Focused", - "m_value": false + "m_value": true }, { "type": "string", "m_label": "Class Name:", @@ -2752,7 +2753,7 @@ "border": 5, "gbSpan": ",", "gbPosition": ",", - "m_styles": [], + "m_styles": ["wxBU_EXACTFIT"], "m_sizerFlags": ["wxRIGHT", "wxTOP", "wxBOTTOM"], "m_properties": [{ "type": "winid", @@ -2813,7 +2814,7 @@ }, { "type": "string", "m_label": "Label:", - "m_value": "Browse" + "m_value": "..." }, { "type": "bool", "m_label": "Default Button", @@ -3409,7 +3410,7 @@ }, { "type": "bitmapPicker", "m_label": "Bitmap File:", - "m_path": "svn-icons/diff.png" + "m_path": "../bitmaps/16-diff.png" }, { "type": "bool", "m_label": "Selected", @@ -3705,7 +3706,7 @@ }, { "type": "bool", "m_label": "Focused", - "m_value": false + "m_value": true }, { "type": "string", "m_label": "Class Name:", @@ -3754,7 +3755,7 @@ "border": 5, "gbSpan": ",", "gbPosition": ",", - "m_styles": [], + "m_styles": ["wxBU_EXACTFIT"], "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"], "m_properties": [{ "type": "winid", @@ -3815,7 +3816,7 @@ }, { "type": "string", "m_label": "Label:", - "m_value": "Browse" + "m_value": "..." }, { "type": "bool", "m_label": "Default Button", @@ -3924,7 +3925,7 @@ }, { "type": "bitmapPicker", "m_label": "Bitmap File:", - "m_path": "svn-icons/secure.png" + "m_path": "../bitmaps/16-lock.png" }, { "type": "bool", "m_label": "Selected", @@ -4094,7 +4095,7 @@ "gbSpan": ",", "gbPosition": ",", "m_styles": [], - "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_CENTER_VERTICAL"], "m_properties": [{ "type": "winid", "m_label": "ID:", @@ -4138,7 +4139,7 @@ }, { "type": "bool", "m_label": "Focused", - "m_value": false + "m_value": true }, { "type": "string", "m_label": "Class Name:", @@ -4180,7 +4181,7 @@ "border": 5, "gbSpan": ",", "gbPosition": ",", - "m_styles": [], + "m_styles": ["wxBU_EXACTFIT"], "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"], "m_properties": [{ "type": "winid", @@ -4241,7 +4242,7 @@ }, { "type": "string", "m_label": "Label:", - "m_value": "Browse" + "m_value": "..." }, { "type": "bool", "m_label": "Default Button", @@ -4351,7 +4352,7 @@ "gbSpan": ",", "gbPosition": ",", "m_styles": [], - "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND", "wxALIGN_CENTER_VERTICAL"], "m_properties": [{ "type": "winid", "m_label": "ID:", @@ -4612,7 +4613,7 @@ }, { "type": "bitmapPicker", "m_label": "Bitmap File:", - "m_path": "svn-icons/integration.png" + "m_path": "../bitmaps/16-connected.png" }, { "type": "bool", "m_label": "Selected", @@ -4794,7 +4795,7 @@ "gbSpan": ",", "gbPosition": ",", "m_styles": [], - "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_VERTICAL"], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT", "wxALIGN_CENTER_VERTICAL"], "m_properties": [{ "type": "winid", "m_label": "ID:", @@ -4876,7 +4877,7 @@ "gbSpan": ",", "gbPosition": ",", "m_styles": [], - "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_CENTER_VERTICAL"], "m_properties": [{ "type": "winid", "m_label": "ID:", @@ -10422,7 +10423,7 @@ "border": 5, "gbSpan": ",", "gbPosition": ",", - "m_styles": ["wxFLP_DEFAULT_STYLE"], + "m_styles": ["wxFLP_DEFAULT_STYLE", "wxFLP_USE_TEXTCTRL", "wxFLP_SMALL"], "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], "m_properties": [{ "type": "winid", @@ -10467,7 +10468,7 @@ }, { "type": "bool", "m_label": "Focused", - "m_value": false + "m_value": true }, { "type": "string", "m_label": "Class Name:", @@ -11743,7 +11744,7 @@ }, { "type": "filePicker", "m_label": "Bitmap File:", - "m_path": "../codelite-icons/subversion/16/svn.png" + "m_path": "../bitmaps/16-subversion.png" }], "m_events": [], "m_children": [] diff --git a/Subversion2/subversion2_subversion2_bitmaps.cpp b/Subversion2/subversion2_subversion2_bitmaps.cpp index 82f2df33ad..4a7b202280 100644 --- a/Subversion2/subversion2_subversion2_bitmaps.cpp +++ b/Subversion2/subversion2_subversion2_bitmaps.cpp @@ -21,504 +21,614 @@ wxMemoryFSHandler::AddFile(name, data, size) #endif -static size_t xml_res_size_0 = 773; +static size_t xml_res_size_0 = 890; static unsigned char xml_res_file_0[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0, -0,31,243,255,97,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0, -65,100,111,98,101,32,73,109,97,103,101,82,101,97,100,121,113,201,101,60, -0,0,2,167,73,68,65,84,120,218,116,82,93,72,84,65,20,254,206,189,119,215, -191,66,133,146,138,94,92,251,33,104,41,177,64,42,83,114,127,52,162,34,159, -66,251,131,12,162,242,161,100,53,31,36,141,178,164,130,160,160,151,32,83, -122,48,43,130,90,17,255,33,42,138,53,234,165,178,40,168,39,73,81,16,210, -221,123,231,78,103,238,238,138,137,206,48,119,102,238,156,115,190,239,124, -231,144,239,74,207,164,105,137,44,41,1,201,211,25,188,17,1,186,166,15,235, -169,233,37,120,86,3,155,12,233,15,4,97,9,139,223,37,12,105,81,223,242,253, -160,226,166,176,108,57,91,14,145,240,117,252,85,48,27,24,249,50,142,167, -67,145,14,119,106,218,145,254,186,226,2,204,27,123,90,6,35,58,108,14,100, -75,88,108,92,127,226,24,86,111,216,234,120,11,203,132,175,58,4,111,222, -10,216,118,126,85,215,192,187,170,93,151,194,32,158,138,37,147,131,136, -205,66,51,180,231,134,76,80,174,184,214,6,77,139,159,109,1,76,71,77,124, -159,32,120,61,57,200,223,184,15,186,11,208,8,72,218,235,124,110,184,219, -125,192,112,248,240,229,73,253,113,172,81,12,152,150,176,44,248,79,214, -34,198,76,62,79,216,208,13,23,218,235,143,206,49,180,133,192,133,198,58, -40,246,70,50,231,115,119,30,204,49,224,119,152,81,192,237,114,35,35,133, -96,176,85,243,253,118,7,72,189,43,123,197,134,248,227,4,80,138,223,62,163, -52,216,146,208,192,66,117,109,29,82,152,231,199,111,99,24,25,253,205,249, -186,153,27,57,168,164,196,35,102,50,51,61,108,104,42,10,35,183,182,181, -37,43,232,84,128,109,240,225,235,31,116,190,236,15,191,191,89,217,136,197, -199,20,237,110,120,60,68,105,153,197,130,116,8,91,17,96,4,142,192,55,136, -191,83,125,111,90,15,159,42,221,190,233,167,173,165,200,64,89,25,167,39, -28,4,67,154,220,7,7,157,172,242,120,101,45,129,48,233,187,218,247,131,88, -196,222,208,194,62,24,112,250,128,130,173,195,176,187,78,67,104,110,233, -15,150,59,8,36,25,197,138,146,94,222,132,23,131,111,199,52,162,28,37,148, -76,42,14,37,34,193,101,104,175,41,120,125,0,170,200,61,181,69,255,33,20, -53,247,70,2,133,155,59,214,173,93,89,153,157,169,67,211,227,98,39,252,89, -68,224,242,189,238,120,21,184,221,164,255,198,171,57,13,84,39,9,174,163, -199,179,10,179,49,137,209,9,160,179,33,222,7,241,54,183,112,168,38,228, -48,50,224,74,71,207,249,194,109,139,9,176,62,247,83,56,215,227,201,73,203, -72,71,69,203,195,56,131,68,169,198,103,226,105,80,160,100,7,223,53,152, -54,100,169,207,207,200,38,116,59,134,254,101,123,105,232,98,137,119,103, -232,209,45,119,70,150,111,97,112,82,206,210,250,69,243,254,21,44,176,137, -36,118,15,175,236,37,170,20,253,39,192,0,45,5,34,27,192,202,177,161,0,0, -0,0,73,69,78,68,174,66,96,130}; +0,31,243,255,97,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, +72,89,115,0,0,9,58,0,0,9,58,1,240,100,146,74,0,0,0,25,116,69,88,116,83, +111,102,116,119,97,114,101,0,119,119,119,46,105,110,107,115,99,97,112,101, +46,111,114,103,155,238,60,26,0,0,2,247,73,68,65,84,56,141,117,83,191,79, +227,88,16,254,94,108,76,156,231,216,33,108,56,216,211,10,57,94,42,36,11, +34,209,108,177,205,106,27,238,202,20,8,75,232,146,146,150,234,164,251,23, +104,173,84,166,33,18,74,187,90,154,205,54,91,46,130,0,210,85,57,150,164, +73,2,94,228,196,126,22,49,142,237,107,72,68,113,55,210,72,51,163,249,190, +25,205,15,130,255,145,147,147,147,18,199,113,26,0,68,81,116,179,179,179, +115,241,95,121,252,75,167,209,104,136,97,24,174,24,134,241,67,150,229,79, +107,107,107,175,1,160,221,110,247,0,252,90,175,215,139,79,79,79,189,74, +165,50,158,98,200,212,168,215,235,11,148,210,111,146,36,21,24,99,167,185, +92,238,183,82,169,180,4,0,23,23,23,247,195,225,240,179,36,73,219,140,49, +219,247,253,247,134,97,56,51,130,70,163,33,242,60,255,125,107,107,107,157, +82,74,30,30,30,224,251,62,28,199,1,0,228,243,121,80,74,145,207,231,225, +251,126,114,118,118,246,247,104,52,218,170,84,42,227,20,0,132,97,184,146, +78,167,11,162,40,18,198,24,186,221,46,56,142,131,170,170,80,85,21,169,84, +10,157,78,7,140,49,136,162,72,210,233,116,129,227,184,21,0,72,1,128,97, +24,63,92,215,61,181,109,27,183,183,183,80,85,21,148,82,12,135,67,12,135, +67,72,146,4,85,85,209,233,116,96,219,54,92,215,61,221,219,219,187,5,0,98, +89,86,73,146,164,79,217,108,150,95,93,93,93,74,146,4,243,243,243,184,186, +186,234,7,65,96,37,73,66,68,81,172,232,186,190,18,4,1,8,33,232,118,187, +247,158,231,77,92,215,253,157,143,227,88,211,52,237,245,242,242,50,108, +219,70,38,147,129,227,56,8,130,192,218,221,221,253,11,0,142,143,143,137, +227,56,127,42,138,130,199,199,71,232,186,190,52,24,12,208,106,181,222,166, +162,40,66,20,69,136,227,24,60,207,35,142,227,153,190,148,105,108,154,51, +197,241,0,110,218,237,118,175,215,235,241,235,235,235,75,147,201,4,146, +36,129,227,184,234,209,209,17,33,132,144,185,185,185,63,36,73,2,0,8,130, +128,243,243,243,123,198,88,24,199,241,63,179,59,176,44,203,218,220,220, +172,200,178,140,241,120,140,36,73,48,26,141,0,0,138,162,128,16,130,116, +58,13,215,117,209,106,181,142,170,213,106,117,182,5,211,52,139,153,76,102, +155,82,10,0,144,101,25,130,32,64,150,101,40,138,2,65,16,144,205,102,1,0, +148,82,100,50,153,109,211,52,139,51,130,241,120,220,103,140,217,158,231, +37,97,24,162,223,239,67,16,4,44,46,46,34,159,207,67,16,4,12,6,3,132,97, +8,207,243,18,198,152,45,138,98,239,229,41,147,253,253,253,95,116,93,255, +74,41,125,229,56,206,215,66,161,240,113,99,99,227,21,0,92,94,94,254,180, +109,251,203,194,194,194,7,223,247,127,94,95,95,127,48,77,243,14,64,50,237, +66,4,144,211,52,237,77,185,92,126,7,160,88,171,213,238,154,205,102,210, +108,54,147,90,173,118,7,160,88,46,151,223,105,154,246,6,64,238,25,147,154, +13,241,185,155,212,243,135,242,7,7,7,155,148,82,13,0,124,223,191,57,60, +60,108,1,152,60,107,60,173,254,47,138,4,92,186,36,132,250,140,0,0,0,0,73, +69,78,68,174,66,96,130}; -static size_t xml_res_size_1 = 3609; +static size_t xml_res_size_1 = 2055; static unsigned char xml_res_file_1[] = { -137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0, -0,31,243,255,97,0,0,0,9,112,72,89,115,0,0,11,18,0,0,11,18,1,210,221,126, -252,0,0,10,79,105,67,67,80,80,104,111,116,111,115,104,111,112,32,73,67, -67,32,112,114,111,102,105,108,101,0,0,120,218,157,83,103,84,83,233,22,61, -247,222,244,66,75,136,128,148,75,111,82,21,8,32,82,66,139,128,20,145,38, -42,33,9,16,74,136,33,161,217,21,81,193,17,69,69,4,27,200,160,136,3,142, -142,128,140,21,81,44,12,138,10,216,7,228,33,162,142,131,163,136,138,202, -251,225,123,163,107,214,188,247,230,205,254,181,215,62,231,172,243,157, -179,207,7,192,8,12,150,72,51,81,53,128,12,169,66,30,17,224,131,199,196, -198,225,228,46,64,129,10,36,112,0,16,8,179,100,33,115,253,35,1,0,248,126, -60,60,43,34,192,7,190,0,1,120,211,11,8,0,192,77,155,192,48,28,135,255,15, -234,66,153,92,1,128,132,1,192,116,145,56,75,8,128,20,0,64,122,142,66,166, -0,64,70,1,128,157,152,38,83,0,160,4,0,96,203,99,98,227,0,80,45,0,96,39, -127,230,211,0,128,157,248,153,123,1,0,91,148,33,21,1,160,145,0,32,19,101, -136,68,0,104,59,0,172,207,86,138,69,0,88,48,0,20,102,75,196,57,0,216,45, -0,48,73,87,102,72,0,176,183,0,192,206,16,11,178,0,8,12,0,48,81,136,133, -41,0,4,123,0,96,200,35,35,120,0,132,153,0,20,70,242,87,60,241,43,174,16, -231,42,0,0,120,153,178,60,185,36,57,69,129,91,8,45,113,7,87,87,46,30,40, -206,73,23,43,20,54,97,2,97,154,64,46,194,121,153,25,50,129,52,15,224,243, -204,0,0,160,145,21,17,224,131,243,253,120,206,14,174,206,206,54,142,182, -14,95,45,234,191,6,255,34,98,98,227,254,229,207,171,112,64,0,0,225,116, -126,209,254,44,47,179,26,128,59,6,128,109,254,162,37,238,4,104,94,11,160, -117,247,139,102,178,15,64,181,0,160,233,218,87,243,112,248,126,60,60,69, -161,144,185,217,217,229,228,228,216,74,196,66,91,97,202,87,125,254,103, -194,95,192,87,253,108,249,126,60,252,247,245,224,190,226,36,129,50,93,129, -71,4,248,224,194,204,244,76,165,28,207,146,9,132,98,220,230,143,71,252, -183,11,255,252,29,211,34,196,73,98,185,88,42,20,227,81,18,113,142,68,154, -140,243,50,165,34,137,66,146,41,197,37,210,255,100,226,223,44,251,3,62, -223,53,0,176,106,62,1,123,145,45,168,93,99,3,246,75,39,16,88,116,192,226, -247,0,0,242,187,111,193,212,40,8,3,128,104,131,225,207,119,255,239,63,253, -71,160,37,0,128,102,73,146,113,0,0,94,68,36,46,84,202,179,63,199,8,0,0, -68,160,129,42,176,65,27,244,193,24,44,192,6,28,193,5,220,193,11,252,96, -54,132,66,36,196,194,66,16,66,10,100,128,28,114,96,41,172,130,66,40,134, -205,176,29,42,96,47,212,64,29,52,192,81,104,134,147,112,14,46,194,85,184, -14,61,112,15,250,97,8,158,193,40,188,129,9,4,65,200,8,19,97,33,218,136, -1,98,138,88,35,142,8,23,153,133,248,33,193,72,4,18,139,36,32,201,136,20, -81,34,75,145,53,72,49,82,138,84,32,85,72,29,242,61,114,2,57,135,92,70,186, -145,59,200,0,50,130,252,134,188,71,49,148,129,178,81,61,212,12,181,67,185, -168,55,26,132,70,162,11,208,100,116,49,154,143,22,160,155,208,114,180,26, -61,140,54,161,231,208,171,104,15,218,143,62,67,199,48,192,232,24,7,51,196, -108,48,46,198,195,66,177,56,44,9,147,99,203,177,34,172,12,171,198,26,176, -86,172,3,187,137,245,99,207,177,119,4,18,129,69,192,9,54,4,119,66,32,97, -30,65,72,88,76,88,78,216,72,168,32,28,36,52,17,218,9,55,9,3,132,81,194, -39,34,147,168,75,180,38,186,17,249,196,24,98,50,49,135,88,72,44,35,214, -18,143,19,47,16,123,136,67,196,55,36,18,137,67,50,39,185,144,2,73,177,164, -84,210,18,210,70,210,110,82,35,233,44,169,155,52,72,26,35,147,201,218,100, -107,178,7,57,148,44,32,43,200,133,228,157,228,195,228,51,228,27,228,33, -242,91,10,157,98,64,113,164,248,83,226,40,82,202,106,74,25,229,16,229,52, -229,6,101,152,50,65,85,163,154,82,221,168,161,84,17,53,143,90,66,173,161, -182,82,175,81,135,168,19,52,117,154,57,205,131,22,73,75,165,173,162,149, -211,26,104,23,104,247,105,175,232,116,186,17,221,149,30,78,151,208,87,210, -203,233,71,232,151,232,3,244,119,12,13,134,21,131,199,136,103,40,25,155, -24,7,24,103,25,119,24,175,152,76,166,25,211,139,25,199,84,48,55,49,235, -152,231,153,15,153,111,85,88,42,182,42,124,21,145,202,10,149,74,149,38, -149,27,42,47,84,169,170,166,170,222,170,11,85,243,85,203,84,143,169,94, -83,125,174,70,85,51,83,227,169,9,212,150,171,85,170,157,80,235,83,27,83, -103,169,59,168,135,170,103,168,111,84,63,164,126,89,253,137,6,89,195,76, -195,79,67,164,81,160,177,95,227,188,198,32,11,99,25,179,120,44,33,107,13, -171,134,117,129,53,196,38,177,205,217,124,118,42,187,152,253,29,187,139, -61,170,169,161,57,67,51,74,51,87,179,82,243,148,102,63,7,227,152,113,248, -156,116,78,9,231,40,167,151,243,126,138,222,20,239,41,226,41,27,166,52, -76,185,49,101,92,107,170,150,151,150,88,171,72,171,81,171,71,235,189,54, -174,237,167,157,166,189,69,187,89,251,129,14,65,199,74,39,92,39,71,103, -143,206,5,157,231,83,217,83,221,167,10,167,22,77,61,58,245,174,46,170,107, -165,27,161,187,68,119,191,110,167,238,152,158,190,94,128,158,76,111,167, -222,121,189,231,250,28,125,47,253,84,253,109,250,167,245,71,12,88,6,179, -12,36,6,219,12,206,24,60,197,53,113,111,60,29,47,199,219,241,81,67,93,195, -64,67,165,97,149,97,151,225,132,145,185,209,60,163,213,70,141,70,15,140, -105,198,92,227,36,227,109,198,109,198,163,38,6,38,33,38,75,77,234,77,238, -154,82,77,185,166,41,166,59,76,59,76,199,205,204,205,162,205,214,153,53, -155,61,49,215,50,231,155,231,155,215,155,223,183,96,90,120,90,44,182,168, -182,184,101,73,178,228,90,166,89,238,182,188,110,133,90,57,89,165,88,85, -90,93,179,70,173,157,173,37,214,187,173,187,167,17,167,185,78,147,78,171, -158,214,103,195,176,241,182,201,182,169,183,25,176,229,216,6,219,174,182, -109,182,125,97,103,98,23,103,183,197,174,195,238,147,189,147,125,186,125, -141,253,61,7,13,135,217,14,171,29,90,29,126,115,180,114,20,58,86,58,222, -154,206,156,238,63,125,197,244,150,233,47,103,88,207,16,207,216,51,227, -182,19,203,41,196,105,157,83,155,211,71,103,23,103,185,115,131,243,136, -139,137,75,130,203,46,151,62,46,155,27,198,221,200,189,228,74,116,245,113, -93,225,122,210,245,157,155,179,155,194,237,168,219,175,238,54,238,105,238, -135,220,159,204,52,159,41,158,89,51,115,208,195,200,67,224,81,229,209,63, -11,159,149,48,107,223,172,126,79,67,79,129,103,181,231,35,47,99,47,145, -87,173,215,176,183,165,119,170,247,97,239,23,62,246,62,114,159,227,62,227, -60,55,222,50,222,89,95,204,55,192,183,200,183,203,79,195,111,158,95,133, -223,67,127,35,255,100,255,122,255,209,0,167,128,37,1,103,3,137,129,65,129, -91,2,251,248,122,124,33,191,142,63,58,219,101,246,178,217,237,65,140,160, -185,65,21,65,143,130,173,130,229,193,173,33,104,200,236,144,173,33,247, -231,152,206,145,206,105,14,133,80,126,232,214,208,7,97,230,97,139,195,126, -12,39,133,135,133,87,134,63,142,112,136,88,26,209,49,151,53,119,209,220, -67,115,223,68,250,68,150,68,222,155,103,49,79,57,175,45,74,53,42,62,170, -46,106,60,218,55,186,52,186,63,198,46,102,89,204,213,88,157,88,73,108,75, -28,57,46,42,174,54,110,108,190,223,252,237,243,135,226,157,226,11,227,123, -23,152,47,200,93,112,121,161,206,194,244,133,167,22,169,46,18,44,58,150, -64,76,136,78,56,148,240,65,16,42,168,22,140,37,242,19,119,37,142,10,121, -194,29,194,103,34,47,209,54,209,136,216,67,92,42,30,78,242,72,42,77,122, -146,236,145,188,53,121,36,197,51,165,44,229,185,132,39,169,144,188,76,13, -76,221,155,58,158,22,154,118,32,109,50,61,58,189,49,131,146,145,144,113, -66,170,33,77,147,182,103,234,103,230,102,118,203,172,101,133,178,254,197, -110,139,183,47,30,149,7,201,107,179,144,172,5,89,45,10,182,66,166,232,84, -90,40,215,42,7,178,103,101,87,102,191,205,137,202,57,150,171,158,43,205, -237,204,179,202,219,144,55,156,239,159,255,237,18,194,18,225,146,182,165, -134,75,87,45,29,88,230,189,172,106,57,178,60,113,121,219,10,227,21,5,43, -134,86,6,172,60,184,138,182,42,109,213,79,171,237,87,151,174,126,189,38, -122,77,107,129,94,193,202,130,193,181,1,107,235,11,85,10,229,133,125,235, -220,215,237,93,79,88,47,89,223,181,97,250,134,157,27,62,21,137,138,174, -20,219,23,151,21,127,216,40,220,120,229,27,135,111,202,191,153,220,148, -180,169,171,196,185,100,207,102,210,102,233,230,222,45,158,91,14,150,170, -151,230,151,14,110,13,217,218,180,13,223,86,180,237,245,246,69,219,47,151, -205,40,219,187,131,182,67,185,163,191,60,184,188,101,167,201,206,205,59, -63,84,164,84,244,84,250,84,54,238,210,221,181,97,215,248,110,209,238,27, -123,188,246,52,236,213,219,91,188,247,253,62,201,190,219,85,1,85,77,213, -102,213,101,251,73,251,179,247,63,174,137,170,233,248,150,251,109,93,173, -78,109,113,237,199,3,210,3,253,7,35,14,182,215,185,212,213,29,210,61,84, -82,143,214,43,235,71,14,199,31,190,254,157,239,119,45,13,54,13,85,141,156, -198,226,35,112,68,121,228,233,247,9,223,247,30,13,58,218,118,140,123,172, -225,7,211,31,118,29,103,29,47,106,66,154,242,154,70,155,83,154,251,91,98, -91,186,79,204,62,209,214,234,222,122,252,71,219,31,15,156,52,60,89,121, -74,243,84,201,105,218,233,130,211,147,103,242,207,140,157,149,157,125,126, -46,249,220,96,219,162,182,123,231,99,206,223,106,15,111,239,186,16,116, -225,210,69,255,139,231,59,188,59,206,92,242,184,116,242,178,219,229,19, -87,184,87,154,175,58,95,109,234,116,234,60,254,147,211,79,199,187,156,187, -154,174,185,92,107,185,238,122,189,181,123,102,247,233,27,158,55,206,221, -244,189,121,241,22,255,214,213,158,57,61,221,189,243,122,111,247,197,247, -245,223,22,221,126,114,39,253,206,203,187,217,119,39,238,173,188,79,188, -95,244,64,237,65,217,67,221,135,213,63,91,254,220,216,239,220,127,106,192, -119,160,243,209,220,71,247,6,133,131,207,254,145,245,143,15,67,5,143,153, -143,203,134,13,134,235,158,56,62,57,57,226,63,114,253,233,252,167,67,207, -100,207,38,158,23,254,162,254,203,174,23,22,47,126,248,213,235,215,206, -209,152,209,161,151,242,151,147,191,109,124,165,253,234,192,235,25,175, -219,198,194,198,30,190,201,120,51,49,94,244,86,251,237,193,119,220,119, -29,239,163,223,15,79,228,124,32,127,40,255,104,249,177,245,83,208,167,251, -147,25,147,147,255,4,3,152,243,252,99,51,45,219,0,0,0,32,99,72,82,77,0, -0,122,37,0,0,128,131,0,0,249,255,0,0,128,233,0,0,117,48,0,0,234,96,0,0, -58,152,0,0,23,111,146,95,197,70,0,0,3,68,73,68,65,84,120,218,60,147,203, -107,156,85,28,134,159,115,206,55,201,132,204,100,102,160,73,26,29,205,197, -90,107,110,77,67,21,33,137,90,13,110,181,118,37,136,98,2,218,40,37,85,40, -184,112,33,24,80,112,97,66,131,46,218,162,232,66,177,32,180,255,128,120, -69,148,46,106,90,141,153,166,73,154,219,76,205,164,233,36,157,219,119,126, -231,184,168,233,187,127,31,120,22,143,242,222,179,187,137,169,201,61,192, -230,123,227,39,221,199,159,125,250,115,60,22,27,136,199,227,20,10,133,242, -216,43,175,214,77,76,77,26,43,126,207,251,239,188,157,219,253,168,93,192, -196,212,228,62,99,204,95,10,118,172,200,176,49,230,199,209,55,94,175,7, -248,226,236,57,140,214,207,148,202,229,51,38,48,15,198,234,234,7,78,140, -140,252,113,15,48,49,53,217,97,140,153,61,250,226,209,200,236,149,43,100, -174,47,184,214,116,90,239,109,106,70,107,88,203,230,88,94,93,163,163,173, -181,242,104,119,119,237,197,11,23,112,98,123,223,61,49,62,19,0,104,173, -135,141,49,193,250,141,21,82,137,20,143,247,39,181,247,224,188,195,139, -162,185,177,145,166,198,70,128,218,236,242,50,38,48,84,170,225,211,192, -204,61,133,15,167,79,95,75,183,180,60,116,127,203,125,160,192,3,222,123, -196,90,130,32,130,82,119,157,87,215,215,217,220,218,146,241,145,209,0,64, -125,48,249,73,4,136,104,173,243,253,189,189,81,99,12,0,183,110,223,102, -45,155,173,40,165,10,70,235,100,235,3,233,72,180,54,138,181,150,63,175, -94,37,209,208,208,180,184,178,86,212,90,235,124,60,22,219,238,238,233,142, -122,192,138,80,42,151,184,190,176,88,9,195,48,61,62,50,218,84,42,151,159, -93,90,94,9,173,8,160,232,234,234,162,90,13,255,137,214,6,219,26,208,29, -109,237,90,137,199,90,193,138,229,78,177,136,247,126,238,212,241,177,13, -128,83,199,199,126,178,34,197,106,24,34,78,240,226,104,111,107,75,121,241, -74,123,208,235,185,44,133,157,2,86,4,43,130,49,1,74,171,246,179,223,124, -29,1,248,252,252,183,157,64,157,243,30,107,45,219,119,182,201,222,204,225, -52,4,78,36,85,19,137,212,45,46,46,109,236,127,120,191,81,10,180,209,36, -19,137,250,124,126,179,240,209,244,244,14,144,108,136,199,2,177,22,15,44, -44,45,209,245,200,129,84,96,12,193,193,206,206,138,19,95,185,225,87,23, -54,242,27,251,82,169,20,10,72,37,147,42,22,143,71,173,181,209,154,72,4, -163,13,34,194,173,173,45,106,35,53,146,170,79,108,37,234,234,209,14,207, -165,153,203,61,98,109,71,60,30,71,196,253,175,226,80,64,36,8,240,222,99, -197,98,157,35,22,139,81,42,151,204,247,191,255,50,116,100,104,16,237,67, -135,247,254,128,181,86,172,21,170,97,133,108,46,135,136,197,57,135,56,135, -181,66,46,151,35,12,67,68,132,48,180,197,98,177,220,14,160,5,79,127,79, -207,121,15,163,115,153,57,151,153,203,132,155,249,252,119,127,207,206,186, -106,24,226,196,145,185,150,161,88,46,95,202,100,50,91,243,243,243,78,161, -78,14,15,61,245,37,128,14,109,21,20,60,118,232,208,87,98,109,179,21,73, -28,238,235,59,102,140,209,74,41,172,88,0,158,56,216,119,216,121,151,46, -85,42,233,35,3,131,103,158,123,114,240,110,141,43,107,235,252,240,219,175, -104,99,120,233,249,23,218,128,24,176,247,181,183,222,124,185,185,165,229, -24,74,169,127,111,102,47,158,155,154,62,13,108,3,59,222,251,197,221,156, -255,27,0,50,132,177,177,162,209,252,223,0,0,0,0,73,69,78,68,174,66,96,130}; +137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, +0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, +72,89,115,0,0,18,116,0,0,18,116,1,222,102,31,120,0,0,0,25,116,69,88,116, +83,111,102,116,119,97,114,101,0,119,119,119,46,105,110,107,115,99,97,112, +101,46,111,114,103,155,238,60,26,0,0,7,132,73,68,65,84,88,133,197,87,109, +104,84,217,25,126,206,199,157,36,115,103,18,157,137,206,140,179,110,52, +31,141,66,146,157,33,24,40,251,107,163,86,40,75,105,109,144,226,87,10,85, +172,46,20,65,255,250,103,161,255,180,168,168,33,132,254,16,49,88,171,80, +75,216,130,11,233,22,177,82,233,24,205,4,141,53,196,137,154,153,201,142, +38,157,207,140,119,238,57,167,63,204,189,204,77,204,118,133,66,95,120,185, +204,249,122,222,243,188,31,231,29,224,255,44,228,67,55,220,184,113,163, +75,74,249,5,128,181,203,166,22,40,165,23,251,250,250,198,63,228,60,254, +161,6,0,184,89,95,95,191,89,215,117,86,61,88,44,22,69,161,80,248,12,192, +15,254,103,6,92,187,118,237,19,0,219,41,165,127,216,179,103,207,44,0,152, +166,217,218,220,220,140,80,40,228,88,155,74,165,216,131,7,15,218,172,223, +215,175,95,15,75,41,127,38,132,248,106,223,190,125,211,171,97,172,234,130, +225,225,225,157,148,210,17,206,57,173,84,42,111,165,148,189,66,136,132, +166,105,115,209,104,20,27,54,108,112,172,79,38,147,24,27,27,67,165,82,9, +48,198,54,81,74,71,57,231,53,66,8,41,165,252,124,239,222,189,95,191,15, +135,174,6,78,8,25,9,133,66,124,251,246,237,188,177,177,177,150,82,250,13, +231,252,21,231,220,212,117,29,74,41,135,234,186,14,206,185,201,57,127,69, +41,253,166,177,177,177,118,199,142,29,60,20,10,113,66,200,200,240,240,240, +206,239,197,192,240,240,240,78,165,212,72,40,20,226,209,104,148,18,66,32, +165,196,211,167,79,225,241,120,16,14,135,1,0,133,66,1,139,139,139,0,128, +186,186,58,120,60,30,0,192,236,236,44,10,133,2,218,219,219,65,41,133,82, +10,143,30,61,146,201,100,210,4,176,130,9,135,1,87,175,94,141,0,248,71,48, +24,228,145,72,132,18,226,180,175,88,44,98,106,106,10,115,115,115,168,84, +42,142,57,77,211,16,12,6,209,210,210,2,93,215,29,115,74,41,60,124,248,80, +166,211,105,83,74,217,115,224,192,129,71,214,156,35,8,165,148,189,156,115, +218,217,217,73,173,141,150,76,77,77,225,249,243,231,208,117,29,45,45,45, +104,104,104,128,203,229,2,0,24,134,129,108,54,139,116,58,141,123,247,238, +97,243,230,205,104,110,110,118,24,209,217,217,73,51,153,12,21,66,252,24, +192,251,13,32,132,92,175,84,42,95,198,98,49,210,221,221,205,40,125,23,34, +143,31,63,70,38,147,65,91,91,27,252,126,63,150,51,83,83,83,131,245,235, +215,99,221,186,117,152,159,159,71,34,145,64,185,92,198,214,173,91,173,139, +33,22,139,9,195,48,222,42,165,110,86,239,117,4,225,254,253,251,95,41,165, +122,51,153,140,49,57,57,9,165,20,102,102,102,176,176,176,128,45,91,182, +192,239,247,219,148,190,79,1,192,231,243,161,189,189,29,11,11,11,120,241, +226,5,148,82,152,156,156,68,38,147,49,148,82,189,253,253,253,255,170,198, +92,81,7,8,33,9,165,20,215,117,29,139,139,139,72,167,211,104,106,106,130, +219,237,182,65,164,148,72,38,147,200,229,114,0,128,250,250,122,132,66,33, +48,246,174,54,185,221,110,124,252,241,199,72,38,147,104,108,108,196,82, +214,112,66,72,98,5,30,0,92,190,124,185,11,192,77,41,101,43,0,104,154,102, +246,246,246,242,151,47,95,162,92,46,35,28,14,219,180,151,74,37,196,227, +241,138,97,24,82,41,117,119,201,232,79,41,165,52,26,141,106,110,183,219, +102,105,118,118,22,110,183,27,225,112,24,163,163,163,102,165,82,225,0,64, +41,157,2,240,243,254,254,254,113,14,0,66,136,47,234,235,235,55,183,180, +180,0,0,116,93,231,192,187,168,175,166,93,74,137,241,241,241,138,97,24, +227,140,177,221,7,15,30,124,1,0,67,67,67,1,77,211,70,226,241,248,39,219, +182,109,211,44,99,215,172,89,131,249,249,121,0,64,79,79,15,47,22,139,0, +128,233,233,233,77,217,108,246,24,128,95,91,49,176,214,237,118,179,64,32, +128,64,32,0,143,199,131,183,111,223,130,49,134,154,154,26,219,199,201,100, +18,229,114,89,26,134,97,131,3,192,225,195,135,231,76,211,236,43,151,203, +50,153,76,218,235,107,107,107,193,24,131,97,24,240,120,60,176,206,175,171, +171,227,0,124,118,16,74,41,33,165,116,4,148,16,2,156,115,187,152,40,165, +44,159,223,61,114,228,136,13,110,201,161,67,135,102,0,252,61,155,205,218, +235,9,33,224,156,195,52,77,199,217,22,158,29,132,213,19,142,8,229,220,49, +86,189,241,125,34,165,36,203,215,112,206,97,85,83,75,170,179,102,85,6,40, +165,208,52,205,49,230,245,122,161,148,250,116,104,104,40,176,28,124,112, +112,48,36,132,248,225,210,26,91,53,77,115,176,184,156,1,171,226,45,20,139, +69,145,74,165,144,74,165,144,203,229,192,24,131,166,105,14,139,3,129,0, +232,187,234,52,114,225,194,133,38,11,252,226,197,139,65,66,200,159,24,99, +52,16,8,56,110,168,105,26,8,33,200,229,114,176,206,47,149,74,38,128,121, +96,41,13,47,93,186,212,197,24,187,33,165,108,91,162,205,236,237,237,229, +166,105,174,160,189,84,42,97,98,98,162,98,24,134,90,150,134,36,18,137,216, +105,88,77,63,99,12,163,163,163,166,105,154,86,26,62,19,66,244,29,59,118, +108,124,197,107,56,48,48,176,30,192,171,142,142,14,45,28,14,67,8,1,165, +20,12,195,112,248,48,149,74,33,155,205,2,0,26,26,26,16,8,4,236,66,4,0,46, +151,11,148,82,80,74,49,59,59,139,137,137,137,10,128,143,142,30,61,250,109, +53,222,251,58,162,77,74,41,51,159,207,107,74,41,48,198,236,32,170,126,1, +67,161,208,138,174,168,154,118,151,203,101,251,59,159,207,67,41,101,18, +66,54,1,112,24,224,120,11,206,159,63,255,145,16,98,212,231,243,185,90,91, +91,237,3,40,165,208,117,29,181,181,181,54,208,106,111,129,213,27,16,66, +108,246,90,91,91,225,243,249,92,66,136,209,129,129,129,240,170,6,0,248, +41,99,172,38,18,137,48,66,136,125,176,97,24,80,74,193,227,241,192,239,247, +91,221,15,8,33,118,174,91,115,30,143,7,82,74,123,143,85,15,34,145,8,99, +140,213,152,166,185,103,85,23,8,33,190,2,112,38,30,143,203,174,174,46,71, +67,82,46,151,97,24,6,234,234,234,224,245,122,209,208,208,0,0,246,27,97, +185,168,88,44,66,8,177,194,53,241,120,92,86,42,21,9,96,180,122,110,69,16, +158,61,123,118,39,33,100,36,24,12,114,203,8,41,37,158,61,123,6,143,199, +131,96,48,8,206,57,24,99,176,250,5,41,37,132,16,48,77,19,233,116,26,133, +66,1,109,109,109,118,254,199,227,113,153,74,165,76,165,212,231,199,143, +31,95,189,37,179,198,78,159,62,253,35,206,249,159,67,161,16,239,232,232, +160,99,99,99,226,205,155,55,21,165,20,231,156,163,167,167,135,123,189,94, +199,166,124,62,143,251,247,239,155,166,105,130,16,98,250,253,126,45,26, +141,178,137,137,9,153,74,165,76,211,52,127,114,242,228,201,219,0,84,245, +62,43,111,200,146,59,52,0,174,219,183,111,207,118,119,119,63,16,66,236, +158,153,153,81,197,98,209,120,242,228,73,223,221,187,119,127,215,214,214, +118,204,231,243,217,77,168,37,243,243,243,72,38,147,244,214,173,91,221, +74,169,191,232,186,190,59,145,72,144,92,46,39,94,191,126,253,139,83,167, +78,253,109,9,143,46,225,41,203,0,11,220,161,119,238,220,121,181,113,227, +198,175,57,231,115,177,88,236,203,43,87,174,76,37,18,9,115,215,174,93,191, +177,94,204,106,41,20,10,72,167,211,24,28,28,60,19,139,197,190,85,74,253, +113,237,218,181,115,211,211,211,191,61,119,238,220,63,171,46,90,173,202, +114,1,251,30,74,1,176,51,103,206,252,213,235,245,110,116,187,221,142,191, +102,165,82,73,228,243,249,151,39,78,156,248,12,128,0,32,151,190,223,169, +86,22,88,3,180,26,108,233,91,173,100,114,114,242,151,77,77,77,191,34,132, +172,169,54,64,41,245,239,153,153,153,223,3,200,47,209,43,151,169,88,246, +181,41,249,111,178,156,182,106,117,216,240,29,186,170,252,7,167,27,68,165, +145,112,11,238,0,0,0,0,73,69,78,68,174,66,96,130}; -static size_t xml_res_size_2 = 796; +static size_t xml_res_size_2 = 414; static unsigned char xml_res_file_2[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0, -0,31,243,255,97,0,0,0,4,103,65,77,65,0,0,175,200,55,5,138,233,0,0,0,25, -116,69,88,116,83,111,102,116,119,97,114,101,0,65,100,111,98,101,32,73,109, -97,103,101,82,101,97,100,121,113,201,101,60,0,0,2,174,73,68,65,84,56,203, -149,146,203,75,148,81,24,198,223,239,58,243,121,183,112,240,86,146,168, -144,27,23,65,160,68,27,233,182,41,232,63,16,202,69,208,202,66,48,112,217, -50,130,150,5,73,11,9,148,200,192,74,201,208,202,75,212,194,48,77,173,70, -27,53,113,156,25,231,187,157,243,157,219,124,29,7,138,32,21,58,240,110, -14,231,249,189,239,251,156,71,9,195,16,14,58,3,211,182,78,5,175,166,84, -212,224,128,87,32,66,155,100,221,246,49,29,115,17,185,164,28,4,120,60,153, -181,164,112,140,11,214,74,153,0,198,57,8,78,193,138,168,144,72,186,240, -125,211,123,169,31,212,29,19,122,221,212,194,214,210,2,21,8,203,1,161,138, -188,83,193,246,9,68,13,5,210,89,167,125,223,9,238,143,108,154,62,225,118, -85,153,17,197,132,64,202,9,118,129,224,7,28,138,45,13,22,87,211,240,99, -109,231,166,186,95,247,171,231,170,168,131,240,157,213,164,35,69,20,34, -114,214,172,71,192,118,17,120,8,67,38,229,1,181,253,229,127,86,120,52,145, -62,42,226,207,122,25,99,90,111,103,103,71,231,221,25,236,96,126,171,178, -220,140,22,71,85,216,76,5,160,169,17,240,108,9,112,209,246,159,21,250,223, -101,44,105,84,63,179,215,47,28,137,110,69,12,195,128,217,217,217,190,174, -174,174,142,51,221,207,79,113,76,70,107,99,197,86,97,145,33,253,96,48,55, -21,135,192,69,117,121,128,236,170,203,142,11,17,67,105,132,80,192,102,124, -150,55,148,19,125,126,126,190,15,99,124,69,86,233,76,230,100,51,11,130, -209,202,154,18,203,77,251,144,76,164,190,230,114,180,57,239,1,14,104,53, -38,188,177,192,4,208,148,28,24,135,155,244,183,43,38,93,54,78,63,148,226, -7,8,161,169,198,240,197,55,230,162,179,43,159,18,104,43,177,245,148,139, -160,101,113,188,155,231,61,240,16,173,1,16,18,20,194,70,26,65,97,84,1,235, -80,141,201,150,62,191,170,175,175,55,98,177,24,12,14,14,142,215,233,35, -109,75,126,219,113,41,76,252,246,44,15,112,49,174,208,20,144,110,135,18, -22,64,114,135,65,105,129,14,181,199,26,140,201,185,55,208,226,197,129,16, -50,61,52,52,148,145,207,51,127,155,158,7,216,46,110,42,178,84,144,90,112, -16,217,93,9,182,50,20,162,186,6,86,237,9,24,126,63,205,184,104,185,182, -215,119,107,219,177,139,166,204,244,88,69,153,169,57,126,0,166,28,69,234, -64,87,21,16,57,1,137,149,109,249,231,97,207,199,225,238,137,189,0,122,214, -197,94,73,129,106,8,153,115,31,19,88,219,176,193,221,241,1,123,1,4,50,56, -216,241,167,133,16,247,246,11,156,158,245,208,152,26,26,231,23,82,46,172, -175,103,24,243,131,30,65,249,178,8,232,54,167,116,67,228,248,207,47,175, -111,240,125,1,200,69,151,157,36,123,34,131,210,206,49,45,250,48,208,65, -225,63,206,47,100,171,170,111,238,200,94,151,0,0,0,0,73,69,78,68,174,66, -96,130}; +0,31,243,255,97,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, +72,89,115,0,0,9,58,0,0,9,58,1,240,100,146,74,0,0,0,25,116,69,88,116,83, +111,102,116,119,97,114,101,0,119,119,119,46,105,110,107,115,99,97,112,101, +46,111,114,103,155,238,60,26,0,0,1,27,73,68,65,84,56,141,213,145,161,78, +196,64,16,134,255,153,98,80,36,64,16,4,131,6,131,32,225,146,123,1,4,9,134, +202,77,211,94,112,8,120,2,94,0,129,111,147,182,1,67,13,10,131,37,28,9,10, +137,194,96,65,22,179,187,63,134,35,189,107,47,185,115,240,187,221,204,247, +237,204,44,240,239,50,24,12,54,154,103,157,7,142,162,104,207,90,251,216, +148,204,44,48,198,244,72,86,0,194,52,77,223,71,247,50,13,72,146,100,219, +57,119,12,0,36,31,0,92,144,12,203,178,28,54,235,22,186,224,56,142,215,189, +247,7,0,78,0,64,85,251,36,207,138,162,24,78,214,182,70,48,198,172,56,231, +94,72,190,2,56,255,233,96,71,68,250,93,143,181,4,170,186,43,34,171,0,174, +68,228,30,192,37,0,120,239,93,151,160,53,130,170,190,121,239,9,96,145,228, +157,170,238,59,231,214,84,53,157,73,96,173,93,14,130,224,150,228,33,128, +37,239,253,117,93,215,91,85,85,125,117,9,198,126,193,24,211,19,145,27,146, +33,128,143,32,8,54,85,245,57,203,178,207,46,120,76,48,130,69,228,40,207, +243,167,105,192,100,126,151,168,170,167,36,195,121,224,191,145,111,147, +62,111,209,191,236,216,135,0,0,0,0,73,69,78,68,174,66,96,130}; -static size_t xml_res_size_3 = 726; +static size_t xml_res_size_3 = 702; static unsigned char xml_res_file_3[] = { -137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0, -0,31,243,255,97,0,0,0,25,116,69,88,116,83,111,102,116,119,97,114,101,0, -65,100,111,98,101,32,73,109,97,103,101,82,101,97,100,121,113,201,101,60, -0,0,2,120,73,68,65,84,120,218,164,83,77,79,19,81,20,61,51,157,182,51,211, -239,22,165,84,74,10,4,136,193,26,13,36,130,198,68,163,75,247,126,36,46, -220,248,23,92,250,115,88,24,93,168,145,24,137,46,144,168,32,49,38,44,32, -10,10,4,80,104,41,109,167,243,217,153,231,125,175,137,33,65,73,140,55,185, -185,47,111,238,57,247,188,243,230,73,140,49,252,79,40,242,248,67,42,146, -14,73,186,73,139,75,148,233,63,53,102,117,40,122,4,141,129,19,108,239,124, -17,207,147,42,155,163,225,174,210,249,204,110,141,157,25,188,127,101,98, -180,28,211,162,58,223,201,36,162,200,38,34,40,117,199,80,202,199,144,140, -41,72,233,10,118,246,26,213,233,153,217,222,233,215,31,242,178,132,41,5, -65,192,251,47,95,155,24,57,93,234,209,245,129,66,2,131,148,153,120,148, -72,34,168,53,93,74,7,243,223,171,88,221,110,162,102,56,185,74,163,251,198, -227,69,102,18,110,74,153,44,185,72,168,216,125,112,231,92,50,69,83,44,199, -199,118,181,133,133,229,221,14,128,192,156,228,112,232,154,166,211,224, -172,240,96,188,104,243,186,193,193,47,231,55,9,88,17,160,227,194,247,125, -32,240,67,130,192,243,60,94,101,126,27,47,222,173,31,105,14,43,50,212,136, -130,152,166,32,174,134,17,167,154,78,234,56,219,99,175,147,7,80,92,87,200, -147,2,242,226,230,213,126,236,211,244,112,136,64,81,2,169,28,216,1,233, -180,214,136,136,19,202,178,140,233,162,177,34,20,56,142,243,91,193,216, -72,23,218,126,32,124,104,217,30,12,211,67,195,176,177,83,241,196,158,215, -14,144,75,70,49,89,46,128,112,178,32,88,252,22,6,99,82,249,209,155,85,212, -234,38,12,203,69,211,242,208,178,218,176,157,54,60,63,56,114,172,11,163, -121,78,32,9,130,229,173,8,175,67,179,159,183,97,89,214,177,230,229,82,42, -38,8,204,143,75,71,239,40,0,119,20,8,113,103,253,206,250,16,64,35,201,42, -134,250,210,24,238,77,163,247,100,28,26,121,83,57,48,177,246,67,25,180, -219,33,34,104,139,91,168,27,13,195,233,202,104,209,44,77,25,46,102,40,211, -98,34,39,169,214,45,84,27,54,102,22,54,240,101,179,134,181,205,154,185, -180,17,47,9,5,161,253,103,200,116,245,63,73,24,167,130,123,183,239,94,28, -232,203,103,196,207,99,184,248,184,82,197,215,173,58,17,216,130,132,135, -101,152,238,167,185,197,29,102,54,95,193,124,11,110,68,31,93,75,78,85,83, -101,159,21,174,251,65,186,16,176,112,50,96,17,233,47,86,28,144,224,247, -104,47,61,5,107,253,228,77,41,74,149,251,240,143,47,153,27,102,255,18,96, -0,87,102,26,163,16,67,64,197,0,0,0,0,73,69,78,68,174,66,96,130}; +137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, +0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, +72,89,115,0,0,18,116,0,0,18,116,1,222,102,31,120,0,0,0,25,116,69,88,116, +83,111,102,116,119,97,114,101,0,119,119,119,46,105,110,107,115,99,97,112, +101,46,111,114,103,155,238,60,26,0,0,2,59,73,68,65,84,88,133,237,149,191, +139,19,81,16,199,191,179,235,59,49,139,65,193,52,103,145,8,106,105,8,41, +244,212,234,174,80,44,204,41,196,102,13,155,172,216,136,149,133,133,85, +238,58,237,44,76,21,242,59,41,2,42,24,184,211,70,203,84,167,241,47,80,2, +42,54,10,66,18,118,147,188,177,185,147,176,236,145,77,72,82,72,166,219, +121,223,157,207,151,217,157,121,192,50,150,241,191,135,174,235,126,195, +48,238,29,118,174,206,27,46,132,120,71,68,15,34,145,200,183,86,171,245, +209,169,81,230,13,7,112,9,192,158,101,89,47,221,116,115,49,48,10,39,162, +102,191,223,95,175,213,106,191,221,180,52,111,184,109,219,215,171,213,234, +159,195,244,71,166,5,153,166,185,58,28,14,35,0,160,170,234,167,92,46,247, +93,215,117,255,202,202,202,91,102,246,4,7,166,232,128,105,154,171,82,202, +23,0,98,35,239,51,17,149,1,28,103,230,91,94,225,192,20,29,96,230,219,0, +54,29,105,98,230,77,102,190,175,40,10,108,219,78,122,129,3,19,140,97,34, +145,56,19,141,70,175,230,243,249,74,56,28,30,16,209,186,67,114,148,136, +174,1,104,149,203,229,186,215,186,158,62,65,60,30,87,53,77,219,3,112,94, +74,185,81,42,149,154,134,97,60,38,162,167,46,114,30,12,6,167,43,149,202, +15,47,181,61,141,161,166,105,49,0,97,0,199,136,232,77,50,153,60,87,44,22, +159,1,72,187,200,73,8,113,193,75,93,207,6,0,108,252,171,78,116,138,153, +119,82,169,84,160,80,40,108,1,120,238,20,75,41,121,214,6,78,140,62,16,209, +89,102,110,232,186,238,15,133,66,143,0,188,26,229,11,33,62,207,218,192, +87,151,220,69,33,196,110,187,221,214,58,157,206,93,34,106,238,231,95,103, +179,217,159,51,53,160,40,74,29,128,91,91,47,75,41,119,3,129,128,10,32,70, +68,31,0,60,244,10,7,60,238,1,203,178,190,8,33,158,16,209,77,102,94,115, +28,95,233,118,187,59,62,159,239,70,38,147,113,142,230,216,24,219,129,131, +245,10,96,27,64,3,238,157,240,245,122,189,147,147,194,129,49,123,96,100, +183,175,29,172,87,85,85,67,68,20,7,16,82,20,229,23,128,247,193,96,176,145, +78,167,229,76,13,76,122,171,77,27,174,6,22,5,119,53,176,72,56,224,242,19, +10,33,234,139,130,3,46,99,40,165,220,218,191,82,239,204,27,190,140,101, +0,192,95,216,139,241,84,224,43,167,141,0,0,0,0,73,69,78,68,174,66,96,130}; -static size_t xml_res_size_4 = 3269; +static size_t xml_res_size_4 = 759; static unsigned char xml_res_file_4[] = { 137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0, -0,31,243,255,97,0,0,0,9,112,72,89,115,0,0,11,19,0,0,11,19,1,0,154,156,24, -0,0,10,79,105,67,67,80,80,104,111,116,111,115,104,111,112,32,73,67,67,32, -112,114,111,102,105,108,101,0,0,120,218,157,83,103,84,83,233,22,61,247, -222,244,66,75,136,128,148,75,111,82,21,8,32,82,66,139,128,20,145,38,42, -33,9,16,74,136,33,161,217,21,81,193,17,69,69,4,27,200,160,136,3,142,142, -128,140,21,81,44,12,138,10,216,7,228,33,162,142,131,163,136,138,202,251, -225,123,163,107,214,188,247,230,205,254,181,215,62,231,172,243,157,179, -207,7,192,8,12,150,72,51,81,53,128,12,169,66,30,17,224,131,199,196,198, -225,228,46,64,129,10,36,112,0,16,8,179,100,33,115,253,35,1,0,248,126,60, -60,43,34,192,7,190,0,1,120,211,11,8,0,192,77,155,192,48,28,135,255,15,234, -66,153,92,1,128,132,1,192,116,145,56,75,8,128,20,0,64,122,142,66,166,0, -64,70,1,128,157,152,38,83,0,160,4,0,96,203,99,98,227,0,80,45,0,96,39,127, -230,211,0,128,157,248,153,123,1,0,91,148,33,21,1,160,145,0,32,19,101,136, -68,0,104,59,0,172,207,86,138,69,0,88,48,0,20,102,75,196,57,0,216,45,0,48, -73,87,102,72,0,176,183,0,192,206,16,11,178,0,8,12,0,48,81,136,133,41,0, -4,123,0,96,200,35,35,120,0,132,153,0,20,70,242,87,60,241,43,174,16,231, -42,0,0,120,153,178,60,185,36,57,69,129,91,8,45,113,7,87,87,46,30,40,206, -73,23,43,20,54,97,2,97,154,64,46,194,121,153,25,50,129,52,15,224,243,204, -0,0,160,145,21,17,224,131,243,253,120,206,14,174,206,206,54,142,182,14, -95,45,234,191,6,255,34,98,98,227,254,229,207,171,112,64,0,0,225,116,126, -209,254,44,47,179,26,128,59,6,128,109,254,162,37,238,4,104,94,11,160,117, -247,139,102,178,15,64,181,0,160,233,218,87,243,112,248,126,60,60,69,161, -144,185,217,217,229,228,228,216,74,196,66,91,97,202,87,125,254,103,194, -95,192,87,253,108,249,126,60,252,247,245,224,190,226,36,129,50,93,129,71, -4,248,224,194,204,244,76,165,28,207,146,9,132,98,220,230,143,71,252,183, -11,255,252,29,211,34,196,73,98,185,88,42,20,227,81,18,113,142,68,154,140, -243,50,165,34,137,66,146,41,197,37,210,255,100,226,223,44,251,3,62,223, -53,0,176,106,62,1,123,145,45,168,93,99,3,246,75,39,16,88,116,192,226,247, -0,0,242,187,111,193,212,40,8,3,128,104,131,225,207,119,255,239,63,253,71, -160,37,0,128,102,73,146,113,0,0,94,68,36,46,84,202,179,63,199,8,0,0,68, -160,129,42,176,65,27,244,193,24,44,192,6,28,193,5,220,193,11,252,96,54, -132,66,36,196,194,66,16,66,10,100,128,28,114,96,41,172,130,66,40,134,205, -176,29,42,96,47,212,64,29,52,192,81,104,134,147,112,14,46,194,85,184,14, -61,112,15,250,97,8,158,193,40,188,129,9,4,65,200,8,19,97,33,218,136,1,98, -138,88,35,142,8,23,153,133,248,33,193,72,4,18,139,36,32,201,136,20,81,34, -75,145,53,72,49,82,138,84,32,85,72,29,242,61,114,2,57,135,92,70,186,145, -59,200,0,50,130,252,134,188,71,49,148,129,178,81,61,212,12,181,67,185,168, -55,26,132,70,162,11,208,100,116,49,154,143,22,160,155,208,114,180,26,61, -140,54,161,231,208,171,104,15,218,143,62,67,199,48,192,232,24,7,51,196, -108,48,46,198,195,66,177,56,44,9,147,99,203,177,34,172,12,171,198,26,176, -86,172,3,187,137,245,99,207,177,119,4,18,129,69,192,9,54,4,119,66,32,97, -30,65,72,88,76,88,78,216,72,168,32,28,36,52,17,218,9,55,9,3,132,81,194, -39,34,147,168,75,180,38,186,17,249,196,24,98,50,49,135,88,72,44,35,214, -18,143,19,47,16,123,136,67,196,55,36,18,137,67,50,39,185,144,2,73,177,164, -84,210,18,210,70,210,110,82,35,233,44,169,155,52,72,26,35,147,201,218,100, -107,178,7,57,148,44,32,43,200,133,228,157,228,195,228,51,228,27,228,33, -242,91,10,157,98,64,113,164,248,83,226,40,82,202,106,74,25,229,16,229,52, -229,6,101,152,50,65,85,163,154,82,221,168,161,84,17,53,143,90,66,173,161, -182,82,175,81,135,168,19,52,117,154,57,205,131,22,73,75,165,173,162,149, -211,26,104,23,104,247,105,175,232,116,186,17,221,149,30,78,151,208,87,210, -203,233,71,232,151,232,3,244,119,12,13,134,21,131,199,136,103,40,25,155, -24,7,24,103,25,119,24,175,152,76,166,25,211,139,25,199,84,48,55,49,235, -152,231,153,15,153,111,85,88,42,182,42,124,21,145,202,10,149,74,149,38, -149,27,42,47,84,169,170,166,170,222,170,11,85,243,85,203,84,143,169,94, -83,125,174,70,85,51,83,227,169,9,212,150,171,85,170,157,80,235,83,27,83, -103,169,59,168,135,170,103,168,111,84,63,164,126,89,253,137,6,89,195,76, -195,79,67,164,81,160,177,95,227,188,198,32,11,99,25,179,120,44,33,107,13, -171,134,117,129,53,196,38,177,205,217,124,118,42,187,152,253,29,187,139, -61,170,169,161,57,67,51,74,51,87,179,82,243,148,102,63,7,227,152,113,248, -156,116,78,9,231,40,167,151,243,126,138,222,20,239,41,226,41,27,166,52, -76,185,49,101,92,107,170,150,151,150,88,171,72,171,81,171,71,235,189,54, -174,237,167,157,166,189,69,187,89,251,129,14,65,199,74,39,92,39,71,103, -143,206,5,157,231,83,217,83,221,167,10,167,22,77,61,58,245,174,46,170,107, -165,27,161,187,68,119,191,110,167,238,152,158,190,94,128,158,76,111,167, -222,121,189,231,250,28,125,47,253,84,253,109,250,167,245,71,12,88,6,179, -12,36,6,219,12,206,24,60,197,53,113,111,60,29,47,199,219,241,81,67,93,195, -64,67,165,97,149,97,151,225,132,145,185,209,60,163,213,70,141,70,15,140, -105,198,92,227,36,227,109,198,109,198,163,38,6,38,33,38,75,77,234,77,238, -154,82,77,185,166,41,166,59,76,59,76,199,205,204,205,162,205,214,153,53, -155,61,49,215,50,231,155,231,155,215,155,223,183,96,90,120,90,44,182,168, -182,184,101,73,178,228,90,166,89,238,182,188,110,133,90,57,89,165,88,85, -90,93,179,70,173,157,173,37,214,187,173,187,167,17,167,185,78,147,78,171, -158,214,103,195,176,241,182,201,182,169,183,25,176,229,216,6,219,174,182, -109,182,125,97,103,98,23,103,183,197,174,195,238,147,189,147,125,186,125, -141,253,61,7,13,135,217,14,171,29,90,29,126,115,180,114,20,58,86,58,222, -154,206,156,238,63,125,197,244,150,233,47,103,88,207,16,207,216,51,227, -182,19,203,41,196,105,157,83,155,211,71,103,23,103,185,115,131,243,136, -139,137,75,130,203,46,151,62,46,155,27,198,221,200,189,228,74,116,245,113, -93,225,122,210,245,157,155,179,155,194,237,168,219,175,238,54,238,105,238, -135,220,159,204,52,159,41,158,89,51,115,208,195,200,67,224,81,229,209,63, -11,159,149,48,107,223,172,126,79,67,79,129,103,181,231,35,47,99,47,145, -87,173,215,176,183,165,119,170,247,97,239,23,62,246,62,114,159,227,62,227, -60,55,222,50,222,89,95,204,55,192,183,200,183,203,79,195,111,158,95,133, -223,67,127,35,255,100,255,122,255,209,0,167,128,37,1,103,3,137,129,65,129, -91,2,251,248,122,124,33,191,142,63,58,219,101,246,178,217,237,65,140,160, -185,65,21,65,143,130,173,130,229,193,173,33,104,200,236,144,173,33,247, -231,152,206,145,206,105,14,133,80,126,232,214,208,7,97,230,97,139,195,126, -12,39,133,135,133,87,134,63,142,112,136,88,26,209,49,151,53,119,209,220, -67,115,223,68,250,68,150,68,222,155,103,49,79,57,175,45,74,53,42,62,170, -46,106,60,218,55,186,52,186,63,198,46,102,89,204,213,88,157,88,73,108,75, -28,57,46,42,174,54,110,108,190,223,252,237,243,135,226,157,226,11,227,123, -23,152,47,200,93,112,121,161,206,194,244,133,167,22,169,46,18,44,58,150, -64,76,136,78,56,148,240,65,16,42,168,22,140,37,242,19,119,37,142,10,121, -194,29,194,103,34,47,209,54,209,136,216,67,92,42,30,78,242,72,42,77,122, -146,236,145,188,53,121,36,197,51,165,44,229,185,132,39,169,144,188,76,13, -76,221,155,58,158,22,154,118,32,109,50,61,58,189,49,131,146,145,144,113, -66,170,33,77,147,182,103,234,103,230,102,118,203,172,101,133,178,254,197, -110,139,183,47,30,149,7,201,107,179,144,172,5,89,45,10,182,66,166,232,84, -90,40,215,42,7,178,103,101,87,102,191,205,137,202,57,150,171,158,43,205, -237,204,179,202,219,144,55,156,239,159,255,237,18,194,18,225,146,182,165, -134,75,87,45,29,88,230,189,172,106,57,178,60,113,121,219,10,227,21,5,43, -134,86,6,172,60,184,138,182,42,109,213,79,171,237,87,151,174,126,189,38, -122,77,107,129,94,193,202,130,193,181,1,107,235,11,85,10,229,133,125,235, -220,215,237,93,79,88,47,89,223,181,97,250,134,157,27,62,21,137,138,174, -20,219,23,151,21,127,216,40,220,120,229,27,135,111,202,191,153,220,148, -180,169,171,196,185,100,207,102,210,102,233,230,222,45,158,91,14,150,170, -151,230,151,14,110,13,217,218,180,13,223,86,180,237,245,246,69,219,47,151, -205,40,219,187,131,182,67,185,163,191,60,184,188,101,167,201,206,205,59, -63,84,164,84,244,84,250,84,54,238,210,221,181,97,215,248,110,209,238,27, -123,188,246,52,236,213,219,91,188,247,253,62,201,190,219,85,1,85,77,213, -102,213,101,251,73,251,179,247,63,174,137,170,233,248,150,251,109,93,173, -78,109,113,237,199,3,210,3,253,7,35,14,182,215,185,212,213,29,210,61,84, -82,143,214,43,235,71,14,199,31,190,254,157,239,119,45,13,54,13,85,141,156, -198,226,35,112,68,121,228,233,247,9,223,247,30,13,58,218,118,140,123,172, -225,7,211,31,118,29,103,29,47,106,66,154,242,154,70,155,83,154,251,91,98, -91,186,79,204,62,209,214,234,222,122,252,71,219,31,15,156,52,60,89,121, -74,243,84,201,105,218,233,130,211,147,103,242,207,140,157,149,157,125,126, -46,249,220,96,219,162,182,123,231,99,206,223,106,15,111,239,186,16,116, -225,210,69,255,139,231,59,188,59,206,92,242,184,116,242,178,219,229,19, -87,184,87,154,175,58,95,109,234,116,234,60,254,147,211,79,199,187,156,187, -154,174,185,92,107,185,238,122,189,181,123,102,247,233,27,158,55,206,221, -244,189,121,241,22,255,214,213,158,57,61,221,189,243,122,111,247,197,247, -245,223,22,221,126,114,39,253,206,203,187,217,119,39,238,173,188,79,188, -95,244,64,237,65,217,67,221,135,213,63,91,254,220,216,239,220,127,106,192, -119,160,243,209,220,71,247,6,133,131,207,254,145,245,143,15,67,5,143,153, -143,203,134,13,134,235,158,56,62,57,57,226,63,114,253,233,252,167,67,207, -100,207,38,158,23,254,162,254,203,174,23,22,47,126,248,213,235,215,206, -209,152,209,161,151,242,151,147,191,109,124,165,253,234,192,235,25,175, -219,198,194,198,30,190,201,120,51,49,94,244,86,251,237,193,119,220,119, -29,239,163,223,15,79,228,124,32,127,40,255,104,249,177,245,83,208,167,251, -147,25,147,147,255,4,3,152,243,252,99,51,45,219,0,0,0,4,103,65,77,65,0, -0,177,142,124,251,81,147,0,0,0,32,99,72,82,77,0,0,122,37,0,0,128,131,0, -0,249,255,0,0,128,233,0,0,117,48,0,0,234,96,0,0,58,152,0,0,23,111,146,95, -197,70,0,0,1,224,73,68,65,84,120,218,164,145,205,107,19,81,20,197,127,111, -102,146,146,84,131,52,213,106,187,17,212,132,138,24,236,40,227,7,184,114, -95,237,66,220,9,66,82,10,10,70,17,209,84,119,45,116,161,113,81,144,38,110, -138,8,110,251,7,20,23,90,37,194,12,40,248,65,141,144,64,43,52,81,91,162, -22,147,137,121,46,12,113,102,146,44,196,187,123,231,220,119,238,189,231, -8,41,37,222,74,103,51,151,129,9,15,124,63,25,79,220,243,246,10,175,64,58, -155,57,15,220,52,12,35,178,123,223,94,0,10,31,242,228,114,185,101,96,58, -25,79,204,119,21,72,103,51,163,192,13,93,215,13,211,52,151,157,141,186, -174,71,154,152,107,19,197,217,164,40,202,165,88,44,102,152,166,153,107, -78,139,38,227,137,40,48,109,89,86,222,48,140,136,247,52,197,115,210,145, -239,149,10,192,30,231,170,201,120,98,94,74,185,237,115,169,4,208,215,85, -160,209,104,132,84,85,5,232,167,189,250,59,113,10,255,89,45,19,239,206, -205,201,127,249,120,101,124,92,0,104,78,240,216,137,227,12,12,238,226,75, -185,252,23,148,32,249,163,221,23,14,83,94,43,241,98,233,121,139,118,9,172, -20,139,4,130,65,10,249,143,29,167,106,154,198,74,177,232,198,156,143,154, -109,83,171,85,169,217,118,71,129,106,181,157,107,121,240,104,66,149,167, -206,156,228,122,118,131,112,175,205,204,216,91,42,63,53,82,11,195,8,96, -246,220,107,214,55,253,76,45,30,229,229,155,111,60,91,178,132,43,133,7, -175,162,108,13,192,157,171,135,249,186,233,35,181,48,76,143,38,153,26,125, -135,4,46,62,62,200,150,30,155,201,179,10,42,245,246,24,127,9,31,15,159, -72,66,189,42,183,198,214,249,97,7,152,125,186,159,186,127,39,169,211,27, -248,253,62,102,22,15,17,10,194,133,3,239,59,199,168,249,52,6,135,134,248, -180,186,218,209,131,237,3,59,40,175,149,168,219,117,119,140,66,136,145, -107,183,39,155,73,20,186,102,239,228,132,16,35,82,74,235,247,0,252,130, -189,13,92,125,102,107,0,0,0,0,73,69,78,68,174,66,96,130}; +0,31,243,255,97,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, +72,89,115,0,0,9,58,0,0,9,58,1,240,100,146,74,0,0,0,25,116,69,88,116,83, +111,102,116,119,97,114,101,0,119,119,119,46,105,110,107,115,99,97,112,101, +46,111,114,103,155,238,60,26,0,0,2,116,73,68,65,84,56,141,189,147,93,72, +20,81,20,199,255,51,119,230,206,206,206,110,186,173,139,186,235,170,96, +95,172,160,98,160,82,130,134,130,101,81,9,21,21,216,83,34,189,90,144,208, +139,208,83,81,81,33,68,16,84,244,82,130,17,73,193,150,47,37,210,106,65, +91,96,145,148,153,105,219,250,177,187,234,216,236,204,236,204,244,80,6, +187,235,131,79,157,151,11,231,220,251,59,135,223,225,2,255,43,70,59,170, +170,194,93,53,157,153,121,118,189,0,203,52,54,219,220,249,215,194,221,117, +247,199,122,202,233,106,158,201,188,216,119,202,185,53,119,154,237,160, +115,66,45,239,160,132,56,4,176,18,5,68,206,237,111,104,218,66,4,81,255, +249,62,244,33,149,72,180,86,247,190,253,193,101,2,4,39,80,80,89,204,122, +152,252,50,154,83,88,200,216,4,192,70,241,231,20,96,172,68,120,95,125,83, +229,108,56,52,18,62,205,159,204,2,112,6,73,90,154,106,234,137,137,20,51, +31,1,99,23,1,187,13,140,36,2,118,17,140,93,4,163,204,33,175,186,222,55, +61,248,168,55,11,0,0,154,101,57,146,14,159,196,56,125,127,187,243,96,69, +10,209,235,133,165,197,160,168,68,153,123,243,228,213,10,200,193,44,7,39, +174,150,117,58,151,228,240,222,151,10,35,204,11,126,226,160,32,14,10,86, +34,117,165,123,118,119,37,87,226,49,121,230,243,205,138,139,35,231,24,192, +250,55,193,225,158,114,154,179,81,191,227,113,121,219,198,147,223,142,180, +14,70,7,0,132,86,235,67,109,155,16,25,29,94,52,168,121,188,182,247,93,48, +109,11,71,47,248,189,174,13,238,167,251,107,118,5,146,186,198,63,12,61, +123,109,35,204,71,48,136,112,44,190,155,22,59,85,178,96,38,42,34,152,217, +119,99,124,34,205,217,177,43,219,26,138,92,158,187,135,234,27,75,20,245, +11,114,236,62,116,52,31,40,131,69,168,5,234,38,172,148,251,43,25,199,98, +98,118,33,56,54,52,159,37,157,178,184,213,182,179,185,152,37,17,24,166, +130,152,50,6,85,79,105,186,174,45,105,70,42,170,235,198,164,174,233,81, +145,47,74,173,37,156,139,171,86,245,237,231,125,253,173,219,27,119,20,184, +124,146,157,122,48,179,16,149,120,142,120,5,129,50,4,54,73,81,99,92,52, +62,149,80,5,51,75,58,247,248,236,167,101,88,104,49,175,167,206,7,74,3,157, +126,183,158,215,55,28,188,12,19,47,44,150,149,97,152,178,69,116,217,84, +120,153,15,76,202,153,128,52,98,251,165,210,22,142,183,61,88,82,212,246, +254,238,175,3,107,141,156,25,105,159,233,222,153,201,160,188,44,151,179, +84,31,94,207,99,0,248,13,210,133,237,104,235,21,221,40,0,0,0,0,73,69,78, +68,174,66,96,130}; -static size_t xml_res_size_5 = 665; +static size_t xml_res_size_5 = 1672; static unsigned char xml_res_file_5[] = { +137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, +0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, +72,89,115,0,0,18,116,0,0,18,116,1,222,102,31,120,0,0,0,25,116,69,88,116, +83,111,102,116,119,97,114,101,0,119,119,119,46,105,110,107,115,99,97,112, +101,46,111,114,103,155,238,60,26,0,0,6,5,73,68,65,84,88,133,237,148,113, +108,85,213,29,199,191,191,115,206,189,247,189,210,62,229,209,66,145,22, +74,43,4,117,48,173,237,152,78,104,149,63,38,200,166,164,80,220,31,154,232, +98,182,44,110,78,151,77,227,178,132,100,11,224,226,178,48,179,37,155,127, +168,89,50,34,204,140,85,147,109,113,115,108,162,72,165,35,54,42,212,1,45, +216,103,91,219,247,94,31,247,190,251,238,187,247,158,243,219,31,165,108, +44,165,125,44,99,254,179,111,114,115,238,185,249,221,223,247,115,190,247, +220,3,252,95,87,64,135,191,122,99,211,219,143,182,55,87,82,43,174,4,128, +36,222,69,172,223,237,123,180,181,251,19,1,32,134,20,210,78,26,198,139, +71,191,113,211,143,254,188,163,83,253,79,1,140,49,168,174,173,71,67,251, +29,32,59,241,72,170,112,238,175,189,223,110,175,159,17,118,174,102,251, +182,193,182,101,114,145,204,83,157,58,167,234,236,146,147,130,45,33,109, +0,182,4,108,9,41,207,143,211,115,71,60,54,191,165,229,179,139,110,238,128, +46,23,145,233,59,24,69,133,66,206,24,190,187,109,79,223,145,127,237,127, +201,104,166,85,87,7,219,143,205,38,50,214,6,25,137,155,141,103,154,133, +38,24,45,33,52,64,26,128,156,94,9,131,192,0,3,82,76,181,22,196,104,92,183, +217,250,184,255,112,237,185,179,167,94,127,251,145,214,175,183,239,249, +219,207,43,78,224,185,29,72,44,41,92,189,49,157,88,208,82,147,168,111,75, +90,233,213,243,84,106,133,168,73,91,148,172,2,73,9,72,9,168,243,163,20, +23,205,195,161,195,80,245,43,32,231,55,160,112,230,4,198,250,222,96,0,123, +81,196,67,109,191,232,243,231,76,0,0,180,129,6,128,216,157,8,99,237,133, +17,39,88,216,73,144,99,131,44,5,40,5,88,18,80,214,148,241,133,103,10,96, +70,156,29,4,235,18,174,106,94,5,103,193,66,202,252,229,119,221,154,131, +53,71,30,94,243,197,138,0,146,138,34,0,208,65,201,152,56,208,38,180,167, +12,108,5,178,172,41,35,75,1,150,53,5,116,254,30,150,154,154,3,208,197,9, +152,177,24,201,37,107,208,180,249,94,53,212,179,247,6,128,15,85,4,0,73, +49,0,128,152,43,248,106,51,138,148,3,43,189,28,58,142,48,126,244,117,173, +195,192,128,232,201,138,0,216,16,67,2,78,237,210,164,109,165,147,142,74, +145,168,73,163,162,61,48,248,38,68,242,106,88,215,92,135,168,236,227,163, +63,189,18,133,110,33,203,36,238,110,255,241,209,222,202,18,0,80,46,187, +243,98,87,167,11,254,216,85,118,49,33,193,14,40,97,65,88,10,164,36,200, +22,83,113,75,1,178,21,82,141,75,80,221,188,10,42,189,20,114,225,114,20, +71,207,98,228,200,65,195,108,14,197,161,220,182,246,167,189,89,160,194, +60,187,118,45,109,110,44,70,206,109,103,38,82,78,222,190,222,206,218,215, +75,95,46,35,91,66,216,18,255,28,105,106,180,228,45,233,85,43,27,22,223, +122,59,72,0,217,19,199,120,226,228,123,68,224,93,167,51,215,126,175,123, +255,126,61,221,123,206,4,186,118,47,239,22,130,159,31,174,118,246,110,253, +101,244,101,32,58,2,20,103,125,231,141,238,149,251,96,120,155,46,149,48, +114,244,96,236,23,178,17,136,239,107,219,115,236,37,224,216,69,181,151, +4,232,220,209,169,106,147,103,118,131,249,177,164,149,160,82,57,184,172, +99,59,200,231,112,250,247,191,137,193,209,32,28,254,66,251,158,254,129, +153,234,102,108,250,165,167,87,214,46,170,26,122,213,146,234,155,219,215, +109,162,21,215,44,189,28,111,64,3,254,68,22,177,95,250,173,43,226,214,75, +153,3,51,36,208,181,179,105,173,54,225,129,186,84,93,122,251,186,141,50, +85,85,131,19,195,39,1,112,67,215,206,101,155,64,28,146,148,101,142,57,4, +157,191,132,10,57,228,16,100,66,166,56,44,246,155,151,109,146,135,58,94, +120,239,25,2,120,54,214,139,0,182,238,110,250,138,32,122,230,211,203,87, +137,187,218,110,151,177,241,0,0,85,142,130,148,114,189,109,209,103,36,193, +87,82,184,34,1,151,132,40,72,152,28,131,178,52,143,198,73,154,49,24,107, +244,192,29,234,84,57,44,103,58,127,53,119,88,10,0,54,254,228,90,103,94, +16,255,140,52,61,120,215,218,78,172,93,121,35,188,96,24,121,239,239,168, +75,125,14,157,171,59,208,241,169,206,24,76,101,64,249,32,25,8,168,128,72, +197,4,91,24,24,21,69,69,148,203,110,236,7,57,127,52,63,80,200,140,159,12, +231,182,7,212,189,63,104,105,228,192,28,176,237,170,53,15,108,184,7,13, +181,245,40,248,3,240,74,163,96,48,242,222,251,136,181,134,214,172,153,17, +48,224,49,211,36,27,228,153,169,192,144,147,0,103,35,29,78,232,48,28,143, +57,246,42,49,190,0,160,45,253,86,149,149,92,252,173,45,15,82,117,50,137, +172,247,14,130,104,242,66,65,41,28,71,172,53,98,173,13,27,19,105,163,67, +109,76,160,181,241,141,49,174,54,166,160,141,41,24,173,93,99,224,11,178, +34,91,213,86,12,32,12,240,164,31,6,81,79,239,31,227,114,20,161,218,105, +129,20,206,140,197,204,115,31,92,134,245,172,155,238,223,69,0,208,181,107, +217,77,82,200,158,116,77,106,209,253,27,182,88,243,171,171,145,115,143, +163,88,30,199,194,212,109,208,198,128,153,124,48,21,1,229,130,100,81,64, +185,68,170,72,176,61,3,147,143,162,226,72,185,236,102,252,32,119,118,52, +63,48,148,25,63,153,251,238,125,199,71,49,199,95,112,97,69,91,118,46,89, +96,41,107,159,148,170,99,251,186,59,229,138,197,45,40,248,131,168,178,27, +113,98,248,56,78,143,100,34,65,84,38,66,73,18,21,65,210,19,68,174,16,52, +201,140,156,54,241,199,218,132,35,113,20,102,188,96,242,195,40,46,15,63, +253,208,192,80,197,0,0,176,109,31,36,159,106,250,62,8,79,172,191,161,149, +215,175,190,69,128,129,151,123,95,197,59,131,31,188,79,68,175,129,217,3, +179,7,34,15,68,30,49,92,24,227,197,66,120,100,25,23,90,122,28,105,47,86, +69,175,231,241,9,239,178,0,166,181,245,135,205,155,133,225,189,13,117,245, +78,215,173,159,183,94,235,127,19,253,131,31,60,191,255,137,161,7,102,107, +246,159,104,198,163,248,215,223,57,253,10,19,218,62,204,142,14,61,251,135, +23,163,177,201,220,127,219,119,118,0,0,216,255,248,224,0,252,170,86,63, +12,122,70,243,19,87,12,96,110,49,104,235,83,203,190,214,245,84,211,61,159, +32,197,149,211,63,0,244,200,190,19,103,137,121,195,0,0,0,0,73,69,78,68, +174,66,96,130}; + +static size_t xml_res_size_6 = 674; +static unsigned char xml_res_file_6[] = { +137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0, +0,31,243,255,97,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, +72,89,115,0,0,9,58,0,0,9,58,1,240,100,146,74,0,0,0,25,116,69,88,116,83, +111,102,116,119,97,114,101,0,119,119,119,46,105,110,107,115,99,97,112,101, +46,111,114,103,155,238,60,26,0,0,2,31,73,68,65,84,56,141,165,145,79,76, +19,65,24,197,223,55,187,203,2,161,82,40,45,81,74,139,137,80,49,30,136,17, +189,122,245,0,94,228,110,162,241,226,197,4,162,17,19,83,227,205,168,7,8, +137,168,152,224,205,63,49,70,47,30,208,16,79,38,122,225,96,98,209,86,80, +130,178,109,217,150,182,219,238,238,236,140,7,75,2,165,49,81,94,50,135, +249,230,205,239,189,204,16,234,232,254,204,221,179,61,145,232,120,107,171, +223,199,185,39,86,126,174,164,127,44,45,95,28,29,189,252,166,158,127,155, +30,206,62,56,183,248,37,81,206,111,228,101,106,41,197,83,75,73,158,206, +26,242,237,252,220,198,237,201,155,35,181,126,181,118,16,137,68,199,131, +193,96,227,147,103,143,147,166,153,189,10,15,136,245,199,110,13,30,59,30, +254,156,72,92,3,240,244,175,0,255,30,191,207,48,12,55,191,110,142,93,26, +187,242,2,0,38,166,38,172,129,129,35,207,125,45,45,129,90,63,219,186,153, +142,15,53,19,131,94,44,110,120,77,118,42,250,232,250,240,200,236,141,83, +167,213,220,66,167,199,93,193,72,234,211,241,161,230,186,13,94,77,158,121, +237,15,133,7,33,68,11,231,28,253,177,222,59,62,253,0,227,30,71,193,114, +61,33,132,34,133,215,214,215,123,248,251,203,169,208,135,225,11,51,39,183, +1,218,246,246,28,245,5,194,237,203,223,22,80,178,92,28,138,180,17,17,65, +7,208,236,135,146,248,244,17,154,44,82,160,187,47,160,232,141,131,59,26, +40,90,131,8,134,15,162,51,170,1,196,32,60,14,16,3,64,16,194,69,160,11,128, +232,6,49,66,33,187,42,118,0,42,133,117,167,93,47,193,241,26,224,216,30, +204,181,36,138,230,47,148,10,38,44,219,66,185,98,161,115,95,4,93,251,99, +168,20,51,118,221,71,252,31,213,0,228,110,1,187,104,32,255,61,188,166,129, +20,0,41,32,41,171,52,170,30,16,136,24,136,41,127,22,177,109,97,155,191, +64,217,172,241,245,253,187,57,141,169,77,170,66,154,42,192,53,240,138,102, +59,30,89,182,231,56,182,112,215,86,211,174,153,205,241,82,33,191,88,77, +144,132,45,138,159,63,209,97,187,229,144,235,82,136,49,214,161,106,228, +7,0,238,202,156,16,34,163,105,210,208,181,38,35,126,111,62,179,121,231, +55,13,61,232,49,80,150,51,93,0,0,0,0,73,69,78,68,174,66,96,130}; + +static size_t xml_res_size_7 = 1449; +static unsigned char xml_res_file_7[] = { +137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, +0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, +72,89,115,0,0,18,116,0,0,18,116,1,222,102,31,120,0,0,0,25,116,69,88,116, +83,111,102,116,119,97,114,101,0,119,119,119,46,105,110,107,115,99,97,112, +101,46,111,114,103,155,238,60,26,0,0,5,38,73,68,65,84,88,133,237,150,223, +111,84,69,20,199,191,103,230,222,187,123,247,71,75,183,208,118,41,173,10, +210,10,138,6,52,18,127,60,250,96,34,40,49,6,163,241,197,7,130,137,15,38, +213,134,104,124,48,202,159,160,137,70,136,136,34,15,70,35,209,152,16,245, +129,55,17,144,42,8,109,133,182,64,127,216,31,116,215,238,110,187,123,239, +204,57,62,108,139,133,110,127,16,176,79,158,228,228,78,238,156,51,243,185, +115,230,126,103,8,75,52,17,161,195,223,29,174,157,24,202,238,242,163,145, +109,209,168,127,159,82,58,198,108,237,84,113,42,155,47,228,79,88,203,71, +108,32,135,218,218,218,166,150,58,46,45,117,242,79,14,238,219,25,245,252, +125,13,233,134,88,186,161,81,37,18,113,104,237,128,153,17,4,69,140,103, +50,252,103,119,55,141,142,142,140,133,28,188,240,250,107,123,126,186,45, +0,34,66,7,14,236,127,190,38,149,250,98,195,134,141,72,167,211,164,181,6, +17,129,153,203,46,2,17,70,169,84,66,87,87,167,116,116,156,230,160,88,122, +178,189,253,205,31,111,25,224,232,209,163,117,185,124,182,103,211,166,7, +98,141,141,141,4,0,153,76,6,189,125,61,200,229,114,33,17,81,42,149,114, +210,233,213,136,199,227,48,38,196,153,51,103,228,236,217,223,179,38,64, +83,123,123,123,97,161,241,157,197,0,6,255,234,223,221,218,210,234,55,52, +52,144,136,160,163,227,180,156,250,245,36,152,229,184,8,78,41,69,208,202, +121,176,170,58,185,117,203,230,45,168,111,168,167,150,214,245,212,211,123, +177,42,91,28,127,25,192,251,183,4,144,72,196,182,213,214,174,36,173,53, +6,7,7,112,226,228,47,8,77,248,220,158,55,222,250,122,38,70,68,232,195,143, +63,216,113,190,243,252,87,241,100,2,190,31,197,154,198,53,42,155,201,62, +181,24,128,90,12,192,81,94,171,239,251,68,68,56,119,238,15,22,182,63,204, +158,28,0,136,72,94,217,245,234,145,124,190,240,125,33,95,96,34,66,34,153, +36,34,218,188,216,248,139,2,144,162,184,227,184,0,8,153,108,214,88,198, +177,138,113,68,12,200,177,160,20,128,64,240,92,23,34,82,115,203,0,0,28, +165,21,132,25,97,16,42,18,206,207,31,42,89,102,171,166,129,32,34,222,162, +131,207,215,241,209,59,219,99,49,77,77,68,4,136,192,10,3,36,20,13,135,158, +61,248,238,211,247,10,137,75,160,132,8,132,128,44,4,33,231,122,214,2,247, +151,81,32,0,128,3,239,237,88,23,139,187,131,59,219,190,172,40,78,115,0, +62,219,251,204,163,138,232,144,181,124,167,200,181,47,129,148,255,121,93, +83,21,123,124,85,244,174,199,44,88,57,218,81,98,45,194,48,52,214,134,40, +106,153,51,129,18,190,80,204,151,240,249,222,29,189,128,125,241,165,183, +191,253,121,65,0,34,250,180,177,121,109,115,93,211,122,24,3,92,204,27,4, +65,9,74,43,152,208,160,170,54,173,235,235,252,27,179,28,16,48,58,193,48, +198,194,90,131,32,8,65,4,108,124,248,9,120,158,198,200,64,239,29,195,151, +46,30,4,208,178,32,0,91,94,87,215,124,15,133,150,240,247,100,1,197,220, +48,58,187,186,48,57,89,128,181,33,252,136,3,82,250,154,132,209,44,45,243, +84,136,108,230,42,152,45,46,247,93,66,117,148,48,21,18,60,223,71,186,185, +85,13,246,118,223,189,104,9,0,144,114,28,16,128,21,213,85,136,70,2,140, +141,119,66,179,96,107,75,2,241,88,100,38,108,86,70,249,145,170,137,35,58, +57,140,177,254,94,212,249,132,84,253,42,248,81,15,32,64,145,186,33,105, +126,0,184,145,4,116,212,3,64,136,37,21,82,117,211,121,211,154,15,170,172, +224,4,130,159,0,106,235,42,116,154,98,197,156,202,0,142,133,95,211,8,82, +14,180,242,0,237,130,20,1,76,96,49,16,17,144,42,31,72,0,32,0,196,154,242, +190,23,1,91,3,97,3,17,6,161,236,249,177,11,75,7,32,91,66,149,155,131,41, +77,129,17,1,139,3,102,133,210,228,4,138,133,113,20,11,89,4,197,2,130,98, +30,65,169,136,208,132,48,54,68,104,202,78,68,72,174,168,65,178,58,133,100, +117,13,86,164,26,32,166,242,21,97,41,66,52,139,236,166,162,151,100,55,7, +240,31,216,252,0,50,87,84,150,23,96,153,236,127,128,121,0,150,167,254,11, +0,44,159,85,6,88,190,5,88,168,4,50,171,13,136,72,249,215,188,205,112,149, +164,88,68,152,64,26,164,92,144,40,128,167,129,216,150,197,144,232,250,3, +137,8,68,4,34,5,82,26,138,20,148,118,167,221,3,72,205,220,144,230,224,223, +8,64,74,169,203,93,103,127,107,114,189,184,114,189,24,28,55,14,210,10,16, +128,156,8,116,36,6,79,164,124,7,81,14,200,41,66,153,0,214,26,40,99,160, +109,249,44,112,35,113,144,114,81,42,6,200,92,29,65,95,247,57,86,74,245, +161,44,232,50,31,128,59,48,154,219,101,229,202,254,161,43,135,155,102,94, +42,210,236,68,163,214,139,248,32,17,104,173,21,51,67,41,210,98,45,66,19, +88,17,65,104,45,139,8,196,88,176,176,134,240,191,37,38,53,60,48,146,221, +13,192,5,16,92,123,93,161,4,106,205,26,68,182,63,242,80,115,210,215,171, +99,190,215,168,137,234,29,215,89,229,57,180,146,153,148,227,80,53,139,40, +71,235,36,17,16,26,155,83,68,108,45,79,0,196,86,120,212,132,60,26,90,59, +60,57,21,12,76,22,204,208,55,199,79,93,234,239,71,9,0,95,183,228,21,0,42, +153,2,160,167,125,166,77,248,119,19,243,244,178,218,233,182,157,213,94, +208,254,1,41,112,95,245,97,88,209,14,0,0,0,0,73,69,78,68,174,66,96,130}; + +static size_t xml_res_size_8 = 669; +static unsigned char xml_res_file_8[] = { +137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,6,0,0, +0,31,243,255,97,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, +72,89,115,0,0,0,199,0,0,0,199,1,98,51,121,33,0,0,0,25,116,69,88,116,83, +111,102,116,119,97,114,101,0,119,119,119,46,105,110,107,115,99,97,112,101, +46,111,114,103,155,238,60,26,0,0,2,26,73,68,65,84,56,141,141,144,77,72, +84,113,20,197,127,247,189,231,200,8,102,104,73,90,84,68,65,100,17,136,141, +89,173,42,168,160,8,92,68,173,250,208,152,86,182,170,69,80,60,164,168,141, +66,133,11,49,117,213,102,160,69,80,11,35,33,162,198,82,91,24,129,4,125, +144,169,20,182,168,137,28,116,124,255,211,194,10,27,180,60,112,225,114, +57,231,222,115,143,145,135,240,214,192,102,112,73,96,15,176,26,136,128, +17,224,1,120,221,97,227,182,87,115,249,246,187,105,77,165,227,153,140,223, +2,156,153,59,207,67,132,169,173,244,71,217,249,166,166,13,83,127,22,180, +166,210,241,204,119,255,30,98,247,2,194,124,220,101,52,81,31,134,230,2, +128,204,55,191,21,91,80,28,33,27,2,30,227,209,23,229,244,186,176,80,241, +104,85,255,1,224,190,53,119,167,183,184,200,31,202,179,61,2,234,49,163, +71,22,27,54,229,234,132,237,68,170,6,170,128,0,136,60,103,91,3,231,130, +36,200,128,55,136,219,248,74,225,220,39,195,63,46,103,23,176,92,181,0,80, +190,51,223,25,141,1,104,220,51,118,92,106,168,237,3,104,238,124,94,231, +240,211,130,18,76,211,192,232,175,250,12,26,67,54,129,167,175,56,38,205, +99,98,222,167,175,181,15,150,132,237,131,69,139,73,211,82,169,148,255,246, +75,197,146,153,120,193,50,69,126,185,44,90,1,86,41,169,28,243,86,34,149, +131,150,131,21,1,31,194,134,196,33,204,4,16,118,62,169,180,176,163,255, +37,166,181,136,0,35,190,192,161,73,224,142,111,222,149,24,83,227,89,23, +59,140,233,40,178,138,0,244,8,56,134,33,248,107,193,59,80,175,25,61,202, +77,15,227,199,118,69,114,87,179,20,236,199,52,203,51,174,7,190,231,181, +69,114,39,65,67,24,47,192,123,26,24,163,51,210,122,240,18,194,93,38,40, +220,56,143,171,200,115,116,24,64,216,53,176,14,69,39,192,18,136,90,96,233, +255,211,211,141,176,97,251,89,15,160,34,103,31,17,53,136,125,139,18,75, +15,41,46,62,7,224,1,36,147,53,57,252,108,61,166,22,192,253,67,234,16,55, +75,179,101,7,195,35,85,211,179,49,228,33,236,122,182,9,113,10,217,94,96, +13,80,0,188,7,235,245,21,181,95,60,93,55,60,151,255,19,3,26,215,39,28,184, +42,133,0,0,0,0,73,69,78,68,174,66,96,130}; + +static size_t xml_res_size_9 = 1376; +static unsigned char xml_res_file_9[] = { +137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,32,0,0,0,32,8,6,0,0, +0,115,122,122,244,0,0,0,4,115,66,73,84,8,8,8,8,124,8,100,136,0,0,0,9,112, +72,89,115,0,0,1,141,0,0,1,141,1,97,211,150,39,0,0,0,25,116,69,88,116,83, +111,102,116,119,97,114,101,0,119,119,119,46,105,110,107,115,99,97,112,101, +46,111,114,103,155,238,60,26,0,0,4,221,73,68,65,84,88,133,205,151,89,108, +85,85,20,134,191,117,206,233,101,232,32,18,40,45,56,210,4,5,84,168,116, +160,5,53,21,173,24,33,62,9,145,32,132,14,233,131,137,26,140,19,82,220,105, +173,214,240,160,152,24,44,180,37,193,70,146,198,23,99,140,162,53,74,104, +241,118,96,104,27,30,136,2,26,43,181,69,80,8,189,189,112,123,206,242,225, +82,188,220,78,151,90,18,255,167,115,214,89,123,255,255,222,103,13,123,11, +49,98,251,222,246,248,190,96,48,15,91,86,130,166,163,204,2,82,128,56,224, +34,232,41,160,29,177,26,38,15,88,251,95,47,201,184,16,203,188,50,150,131, +217,237,191,13,228,85,160,8,97,74,140,122,3,192,167,182,107,87,150,150, +100,156,28,151,128,170,170,182,184,110,103,160,12,149,205,128,47,70,226, +104,92,1,62,192,14,188,101,54,229,5,99,22,80,190,187,249,110,87,216,7,100, +143,147,248,122,168,116,218,232,211,165,197,217,167,199,20,80,94,211,122, +143,171,222,15,132,255,239,196,65,232,181,32,127,91,97,118,123,164,217, +138,124,49,181,173,115,93,207,251,110,194,201,1,148,100,79,249,216,212, +249,147,174,215,117,21,85,85,109,113,221,182,219,12,164,79,0,93,16,56,10, +116,136,74,187,136,116,120,147,221,78,179,126,233,197,104,71,103,240,161, +219,246,182,254,7,242,62,208,99,32,141,88,86,67,82,66,168,105,243,154,220, +126,128,247,106,26,19,251,117,210,124,130,178,198,84,55,47,64,245,126,132, +131,166,104,105,25,92,221,129,171,65,119,130,112,78,199,2,15,180,13,97, +191,165,246,126,175,235,82,179,49,121,3,168,74,121,181,255,94,87,36,7,36, +7,200,1,230,19,245,171,129,43,224,46,52,69,185,63,59,0,174,200,139,160, +163,147,11,189,40,7,80,109,136,243,156,47,222,44,201,232,6,120,167,246, +200,204,208,237,241,107,77,181,127,37,181,45,249,174,88,201,49,44,192,7, +246,107,64,177,152,58,127,18,65,233,2,18,135,113,60,140,202,103,150,165, +95,109,43,200,234,64,68,1,42,118,251,103,133,44,158,5,89,135,178,100,152, +21,198,130,62,46,7,82,28,130,242,104,20,249,113,84,234,176,165,222,20,100, +158,186,102,45,4,83,227,207,71,229,133,16,60,129,254,27,63,227,68,188,248, +226,159,114,128,135,129,62,96,31,170,53,166,120,169,63,218,211,236,106, +89,140,165,31,162,60,52,78,178,0,112,22,112,35,108,253,42,44,112,80,105, +244,249,180,98,203,198,236,115,35,14,183,120,31,134,144,135,128,243,168, +244,34,250,27,104,47,208,5,210,3,116,89,66,143,39,86,79,188,227,235,121, +101,195,162,190,145,166,30,179,25,1,212,215,215,219,63,93,184,99,134,231, +144,36,106,5,7,250,251,254,50,207,231,93,138,101,236,255,30,49,237,64,36, +140,81,139,59,91,147,45,6,102,106,200,158,141,165,201,10,179,64,102,0,211, +80,18,16,124,192,121,144,14,83,152,185,115,48,123,134,23,160,42,239,238, +108,156,230,250,172,164,1,124,137,150,120,137,30,222,76,241,236,57,42,164, +128,206,70,72,65,73,5,73,5,77,134,152,51,224,87,146,18,230,153,53,11,175, +12,89,72,157,63,73,46,91,171,197,212,52,183,160,100,222,232,78,140,129, +16,34,123,124,226,108,221,82,240,224,217,107,86,85,49,181,205,203,80,89, +7,172,7,90,28,148,118,32,19,240,128,78,194,53,97,238,56,137,143,11,124, +98,199,185,117,91,55,230,254,62,104,44,219,213,178,208,19,125,134,154,150, +245,32,105,215,188,69,143,57,162,210,160,162,69,132,171,89,26,55,86,213, +194,61,1,235,107,44,247,115,83,144,115,4,194,113,98,170,91,179,16,119,21, +42,107,61,116,222,112,131,5,126,148,202,170,182,91,130,182,123,6,152,4, +28,2,110,5,238,27,133,244,36,232,65,144,111,113,237,111,76,73,198,159,0, +102,103,83,178,196,57,143,168,200,99,168,174,6,82,199,16,127,110,122,96, +250,28,1,48,187,155,171,17,10,135,113,10,1,29,136,54,137,74,163,227,218, +141,131,77,200,124,244,125,2,147,167,228,162,214,227,160,249,192,3,99,16, +70,175,127,135,41,202,122,41,28,205,142,247,54,174,245,28,112,14,225,176, +40,141,42,218,148,148,232,29,30,236,235,21,85,109,169,3,182,187,220,84, +183,44,3,93,14,44,10,247,131,17,51,108,52,4,108,213,29,16,81,7,76,85,219, +84,83,146,17,0,48,213,135,166,11,78,186,226,165,131,164,19,62,156,166,13, +63,215,56,160,242,134,41,206,170,188,78,0,128,169,241,151,161,178,1,184, +115,194,200,134,226,104,170,107,103,151,148,100,132,32,42,226,109,79,246, +0,83,111,34,249,47,72,104,213,32,249,16,1,165,197,217,167,45,219,93,1,244, +220,4,242,30,91,172,149,166,112,249,153,72,227,144,156,223,182,41,183,19, +203,202,37,124,170,157,32,104,147,19,231,46,41,45,204,60,17,253,101,216, +162,99,10,50,79,97,7,114,17,173,36,124,189,26,47,2,64,69,170,235,228,69, +86,198,72,140,217,13,203,171,218,210,92,219,125,25,216,72,236,241,209,7, +82,141,77,165,217,148,245,199,104,142,49,183,227,237,123,219,227,251,46, +247,63,9,178,2,97,49,112,23,48,13,176,16,254,70,57,141,210,34,202,151,26, +23,56,48,210,101,52,26,255,0,85,133,207,225,11,178,60,7,0,0,0,0,73,69,78, +68,174,66,96,130}; + +static size_t xml_res_size_10 = 1261; +static unsigned char xml_res_file_10[] = { 60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101, 110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101, 115,111,117,114,99,101,32,120,109,108,110,115,61,34,104,116,116,112,58, -47,47,119,119,119,46,119,120,119,105,110,100,111,119,115,46,111,114,103, +47,47,119,119,119,46,119,120,119,105,100,103,101,116,115,46,111,114,103, 47,119,120,120,114,99,34,62,10,32,32,60,111,98,106,101,99,116,32,99,108, 97,115,115,61,34,119,120,66,105,116,109,97,112,34,32,110,97,109,101,61, -34,100,105,102,102,34,62,115,117,98,118,101,114,115,105,111,110,50,95,115, -117,98,118,101,114,115,105,111,110,50,95,98,105,116,109,97,112,115,46,99, -112,112,36,115,118,110,45,105,99,111,110,115,95,100,105,102,102,46,112, -110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,111,98,106,101,99,116, -32,99,108,97,115,115,61,34,119,120,66,105,116,109,97,112,34,32,110,97,109, -101,61,34,103,101,110,101,114,97,108,34,62,115,117,98,118,101,114,115,105, -111,110,50,95,115,117,98,118,101,114,115,105,111,110,50,95,98,105,116,109, -97,112,115,46,99,112,112,36,115,118,110,45,105,99,111,110,115,95,103,101, -110,101,114,97,108,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32, -32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116, -109,97,112,34,32,110,97,109,101,61,34,105,110,116,101,103,114,97,116,105, -111,110,34,62,115,117,98,118,101,114,115,105,111,110,50,95,115,117,98,118, -101,114,115,105,111,110,50,95,98,105,116,109,97,112,115,46,99,112,112,36, -115,118,110,45,105,99,111,110,115,95,105,110,116,101,103,114,97,116,105, -111,110,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,111,98, -106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109,97,112, -34,32,110,97,109,101,61,34,109,95,98,109,112,83,118,110,34,62,115,117,98, +34,49,54,45,99,111,103,34,62,115,117,98,118,101,114,115,105,111,110,50, +95,115,117,98,118,101,114,115,105,111,110,50,95,98,105,116,109,97,112,115, +46,99,112,112,36,46,46,95,98,105,116,109,97,112,115,95,49,54,45,99,111, +103,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,111,98,106, +101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109,97,112,34, +32,110,97,109,101,61,34,49,54,45,99,111,103,64,50,120,34,62,115,117,98, 118,101,114,115,105,111,110,50,95,115,117,98,118,101,114,115,105,111,110, -50,95,98,105,116,109,97,112,115,46,99,112,112,36,46,46,95,99,111,100,101, -108,105,116,101,45,105,99,111,110,115,95,115,117,98,118,101,114,115,105, -111,110,95,49,54,95,115,118,110,46,112,110,103,60,47,111,98,106,101,99, -116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119, -120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,115,101,99,117,114, -101,34,62,115,117,98,118,101,114,115,105,111,110,50,95,115,117,98,118,101, -114,115,105,111,110,50,95,98,105,116,109,97,112,115,46,99,112,112,36,115, -118,110,45,105,99,111,110,115,95,115,101,99,117,114,101,46,112,110,103, -60,47,111,98,106,101,99,116,62,10,60,47,114,101,115,111,117,114,99,101, -62,10}; +50,95,98,105,116,109,97,112,115,46,99,112,112,36,46,46,95,98,105,116,109, +97,112,115,95,49,54,45,99,111,103,64,50,120,46,112,110,103,60,47,111,98, +106,101,99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115, +61,34,119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,49,54,45, +99,111,110,110,101,99,116,101,100,34,62,115,117,98,118,101,114,115,105, +111,110,50,95,115,117,98,118,101,114,115,105,111,110,50,95,98,105,116,109, +97,112,115,46,99,112,112,36,46,46,95,98,105,116,109,97,112,115,95,49,54, +45,99,111,110,110,101,99,116,101,100,46,112,110,103,60,47,111,98,106,101, +99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34, +119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,49,54,45,99,111, +110,110,101,99,116,101,100,64,50,120,34,62,115,117,98,118,101,114,115,105, +111,110,50,95,115,117,98,118,101,114,115,105,111,110,50,95,98,105,116,109, +97,112,115,46,99,112,112,36,46,46,95,98,105,116,109,97,112,115,95,49,54, +45,99,111,110,110,101,99,116,101,100,64,50,120,46,112,110,103,60,47,111, +98,106,101,99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115, +115,61,34,119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,49,54, +45,100,105,102,102,34,62,115,117,98,118,101,114,115,105,111,110,50,95,115, +117,98,118,101,114,115,105,111,110,50,95,98,105,116,109,97,112,115,46,99, +112,112,36,46,46,95,98,105,116,109,97,112,115,95,49,54,45,100,105,102,102, +46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,111,98,106,101, +99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109,97,112,34,32,110, +97,109,101,61,34,49,54,45,100,105,102,102,64,50,120,34,62,115,117,98,118, +101,114,115,105,111,110,50,95,115,117,98,118,101,114,115,105,111,110,50, +95,98,105,116,109,97,112,115,46,99,112,112,36,46,46,95,98,105,116,109,97, +112,115,95,49,54,45,100,105,102,102,64,50,120,46,112,110,103,60,47,111, +98,106,101,99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115, +115,61,34,119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,49,54, +45,108,111,99,107,34,62,115,117,98,118,101,114,115,105,111,110,50,95,115, +117,98,118,101,114,115,105,111,110,50,95,98,105,116,109,97,112,115,46,99, +112,112,36,46,46,95,98,105,116,109,97,112,115,95,49,54,45,108,111,99,107, +46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,111,98,106,101, +99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109,97,112,34,32,110, +97,109,101,61,34,49,54,45,108,111,99,107,64,50,120,34,62,115,117,98,118, +101,114,115,105,111,110,50,95,115,117,98,118,101,114,115,105,111,110,50, +95,98,105,116,109,97,112,115,46,99,112,112,36,46,46,95,98,105,116,109,97, +112,115,95,49,54,45,108,111,99,107,64,50,120,46,112,110,103,60,47,111,98, +106,101,99,116,62,10,32,32,60,111,98,106,101,99,116,32,99,108,97,115,115, +61,34,119,120,66,105,116,109,97,112,34,32,110,97,109,101,61,34,109,95,98, +109,112,83,118,110,34,62,115,117,98,118,101,114,115,105,111,110,50,95,115, +117,98,118,101,114,115,105,111,110,50,95,98,105,116,109,97,112,115,46,99, +112,112,36,46,46,95,98,105,116,109,97,112,115,95,49,54,45,115,117,98,118, +101,114,115,105,111,110,46,112,110,103,60,47,111,98,106,101,99,116,62,10, +32,32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105, +116,109,97,112,34,32,110,97,109,101,61,34,109,95,98,109,112,83,118,110, +64,50,120,34,62,115,117,98,118,101,114,115,105,111,110,50,95,115,117,98, +118,101,114,115,105,111,110,50,95,98,105,116,109,97,112,115,46,99,112,112, +36,46,46,95,98,105,116,109,97,112,115,95,49,54,45,115,117,98,118,101,114, +115,105,111,110,64,50,120,46,112,110,103,60,47,111,98,106,101,99,116,62, +10,60,47,114,101,115,111,117,114,99,101,62,10}; void wxC95F2InitBitmapResources() { @@ -533,11 +643,16 @@ void wxC95F2InitBitmapResources() else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase); } - XRC_ADD_FILE(wxT("XRC_resource/subversion2_subversion2_bitmaps.cpp$svn-icons_diff.png"), xml_res_file_0, xml_res_size_0, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/subversion2_subversion2_bitmaps.cpp$svn-icons_general.png"), xml_res_file_1, xml_res_size_1, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/subversion2_subversion2_bitmaps.cpp$svn-icons_integration.png"), xml_res_file_2, xml_res_size_2, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/subversion2_subversion2_bitmaps.cpp$.._codelite-icons_subversion_16_svn.png"), xml_res_file_3, xml_res_size_3, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/subversion2_subversion2_bitmaps.cpp$svn-icons_secure.png"), xml_res_file_4, xml_res_size_4, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/subversion2_subversion2_bitmaps.cpp$C__src_codelite_Subversion2_subversion2_subversion2_bitmaps.xrc"), xml_res_file_5, xml_res_size_5, wxT("text/xml")); + XRC_ADD_FILE(wxT("XRC_resource/subversion2_subversion2_bitmaps.cpp$.._bitmaps_16-cog.png"), xml_res_file_0, xml_res_size_0, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/subversion2_subversion2_bitmaps.cpp$.._bitmaps_16-cog@2x.png"), xml_res_file_1, xml_res_size_1, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/subversion2_subversion2_bitmaps.cpp$.._bitmaps_16-connected.png"), xml_res_file_2, xml_res_size_2, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/subversion2_subversion2_bitmaps.cpp$.._bitmaps_16-connected@2x.png"), xml_res_file_3, xml_res_size_3, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/subversion2_subversion2_bitmaps.cpp$.._bitmaps_16-diff.png"), xml_res_file_4, xml_res_size_4, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/subversion2_subversion2_bitmaps.cpp$.._bitmaps_16-diff@2x.png"), xml_res_file_5, xml_res_size_5, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/subversion2_subversion2_bitmaps.cpp$.._bitmaps_16-lock.png"), xml_res_file_6, xml_res_size_6, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/subversion2_subversion2_bitmaps.cpp$.._bitmaps_16-lock@2x.png"), xml_res_file_7, xml_res_size_7, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/subversion2_subversion2_bitmaps.cpp$.._bitmaps_16-subversion.png"), xml_res_file_8, xml_res_size_8, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/subversion2_subversion2_bitmaps.cpp$.._bitmaps_16-subversion@2x.png"), xml_res_file_9, xml_res_size_9, wxT("image/png")); + XRC_ADD_FILE(wxT("XRC_resource/subversion2_subversion2_bitmaps.cpp$C__src_codelite_Subversion2_subversion2_subversion2_bitmaps.xrc"), xml_res_file_10, xml_res_size_10, wxT("text/xml")); wxXmlResource::Get()->Load(wxT("memory:XRC_resource/subversion2_subversion2_bitmaps.cpp$C__src_codelite_Subversion2_subversion2_subversion2_bitmaps.xrc")); } diff --git a/Subversion2/subversion2_ui.cpp b/Subversion2/subversion2_ui.cpp index 2a3879ea12..464dc49313 100644 --- a/Subversion2/subversion2_ui.cpp +++ b/Subversion2/subversion2_ui.cpp @@ -86,11 +86,10 @@ SubversionPageBase::SubversionPageBase(wxWindow* parent, wxWindowID id, const wx boxSizer30->Add(m_sci, 1, wxALL|wxEXPAND, 2); SetName(wxT("SubversionPageBase")); - SetSizeHints(-1,-1); - if ( GetSizer() ) { + SetSize(-1,-1); + if (GetSizer()) { GetSizer()->Fit(this); } - CentreOnParent(wxBOTH); // Connect events m_treeCtrl->Connect(wxEVT_COMMAND_TREE_ITEM_ACTIVATED, wxTreeEventHandler(SubversionPageBase::OnItemActivated), NULL, this); m_treeCtrl->Connect(wxEVT_COMMAND_TREE_ITEM_MENU, wxTreeEventHandler(SubversionPageBase::OnTreeMenu), NULL, this); @@ -134,9 +133,10 @@ SvnCopyDialogBase::SvnCopyDialogBase(wxWindow* parent, wxWindowID id, const wxSt m_staticText3 = new wxStaticText(this, wxID_ANY, _("Source URL:"), wxDefaultPosition, wxSize(-1, -1), 0); - fgSizer1->Add(m_staticText3, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5); + fgSizer1->Add(m_staticText3, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5); m_textCtrlSourceURL = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0); + m_textCtrlSourceURL->SetFocus(); #if wxVERSION_NUMBER >= 3000 m_textCtrlSourceURL->SetHint(wxT("")); #endif @@ -145,7 +145,7 @@ SvnCopyDialogBase::SvnCopyDialogBase(wxWindow* parent, wxWindowID id, const wxSt m_staticText4 = new wxStaticText(this, wxID_ANY, _("Target URL:"), wxDefaultPosition, wxSize(-1, -1), 0); - fgSizer1->Add(m_staticText4, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5); + fgSizer1->Add(m_staticText4, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5); m_textCtrlTargetURL = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0); #if wxVERSION_NUMBER >= 3000 @@ -185,11 +185,16 @@ SvnCopyDialogBase::SvnCopyDialogBase(wxWindow* parent, wxWindowID id, const wxSt bSizer8->Add(m_button5, 0, wxALL, 5); SetName(wxT("SvnCopyDialogBase")); - SetSizeHints(575,315); - if ( GetSizer() ) { + SetMinClientSize(wxSize(400,250)); + SetSize(-1,-1); + if (GetSizer()) { GetSizer()->Fit(this); } - CentreOnParent(wxBOTH); + if(GetParent()) { + CentreOnParent(wxBOTH); + } else { + CentreOnScreen(wxBOTH); + } #if wxVERSION_NUMBER >= 2900 if(!wxPersistenceManager::Get().Find(this)) { wxPersistenceManager::Get().RegisterAndRestore(this); @@ -228,6 +233,7 @@ SvnLoginDialogBase::SvnLoginDialogBase(wxWindow* parent, wxWindowID id, const wx fgSizer2->Add(m_staticText6, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5); m_textCtrlUsername = new wxTextCtrl(this, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0); + m_textCtrlUsername->SetFocus(); #if wxVERSION_NUMBER >= 3000 m_textCtrlUsername->SetHint(wxT("")); #endif @@ -260,11 +266,15 @@ SvnLoginDialogBase::SvnLoginDialogBase(wxWindow* parent, wxWindowID id, const wx bSizer11->Add(m_button7, 0, wxALL, 5); SetName(wxT("SvnLoginDialogBase")); - SetSizeHints(-1,-1); - if ( GetSizer() ) { + SetSize(-1,-1); + if (GetSizer()) { GetSizer()->Fit(this); } - CentreOnParent(wxBOTH); + if(GetParent()) { + CentreOnParent(wxBOTH); + } else { + CentreOnScreen(wxBOTH); + } #if wxVERSION_NUMBER >= 2900 if(!wxPersistenceManager::Get().Find(this)) { wxPersistenceManager::Get().RegisterAndRestore(this); @@ -300,7 +310,7 @@ SvnPreferencesDialogBase::SvnPreferencesDialogBase(wxWindow* parent, wxWindowID m_panel3 = new wxPanel(m_treebook1, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxTAB_TRAVERSAL); int m_panel3ImgIndex; - m_panel3ImgIndex = m_treebook1_il->Add(wxXmlResource::Get()->LoadBitmap(wxT("general"))); + m_panel3ImgIndex = m_treebook1_il->Add(wxXmlResource::Get()->LoadBitmap(wxT("16-cog"))); m_treebook1->AddPage(m_panel3, _("General"), true, m_panel3ImgIndex); wxBoxSizer* bSizer15 = new wxBoxSizer(wxVERTICAL); @@ -318,13 +328,14 @@ SvnPreferencesDialogBase::SvnPreferencesDialogBase(wxWindow* parent, wxWindowID fgSizer3->Add(m_staticTextExe, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5); m_textCtrlSvnExecutable = new wxTextCtrl(m_panel3, wxID_ANY, wxT("svn"), wxDefaultPosition, wxSize(-1, -1), 0); + m_textCtrlSvnExecutable->SetFocus(); #if wxVERSION_NUMBER >= 3000 m_textCtrlSvnExecutable->SetHint(wxT("")); #endif - fgSizer3->Add(m_textCtrlSvnExecutable, 1, wxALL|wxEXPAND, 5); + fgSizer3->Add(m_textCtrlSvnExecutable, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5); - m_buttonBrowse = new wxButton(m_panel3, wxID_ANY, _("Browse"), wxDefaultPosition, wxSize(-1, -1), 0); + m_buttonBrowse = new wxButton(m_panel3, wxID_ANY, _("..."), wxDefaultPosition, wxSize(-1, -1), wxBU_EXACTFIT); fgSizer3->Add(m_buttonBrowse, 0, wxRIGHT|wxTOP|wxBOTTOM, 5); @@ -363,7 +374,7 @@ SvnPreferencesDialogBase::SvnPreferencesDialogBase(wxWindow* parent, wxWindowID m_panel4 = new wxPanel(m_treebook1, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxTAB_TRAVERSAL); int m_panel4ImgIndex; - m_panel4ImgIndex = m_treebook1_il->Add(wxXmlResource::Get()->LoadBitmap(wxT("diff"))); + m_panel4ImgIndex = m_treebook1_il->Add(wxXmlResource::Get()->LoadBitmap(wxT("16-diff"))); m_treebook1->AddPage(m_panel4, _("External Diff"), false, m_panel4ImgIndex); wxBoxSizer* bSizer16 = new wxBoxSizer(wxVERTICAL); @@ -386,19 +397,20 @@ SvnPreferencesDialogBase::SvnPreferencesDialogBase(wxWindow* parent, wxWindowID fgSizer5->Add(m_staticText10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5); m_textCtrlDiffViewer = new wxTextCtrl(m_panel4, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0); + m_textCtrlDiffViewer->SetFocus(); #if wxVERSION_NUMBER >= 3000 m_textCtrlDiffViewer->SetHint(wxT("")); #endif fgSizer5->Add(m_textCtrlDiffViewer, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5); - m_buttonBrowseExtDiff = new wxButton(m_panel4, wxID_ANY, _("Browse"), wxDefaultPosition, wxSize(-1, -1), 0); + m_buttonBrowseExtDiff = new wxButton(m_panel4, wxID_ANY, _("..."), wxDefaultPosition, wxSize(-1, -1), wxBU_EXACTFIT); fgSizer5->Add(m_buttonBrowseExtDiff, 0, wxALL, 5); m_panel5 = new wxPanel(m_treebook1, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxTAB_TRAVERSAL); int m_panel5ImgIndex; - m_panel5ImgIndex = m_treebook1_il->Add(wxXmlResource::Get()->LoadBitmap(wxT("secure"))); + m_panel5ImgIndex = m_treebook1_il->Add(wxXmlResource::Get()->LoadBitmap(wxT("16-lock"))); m_treebook1->AddPage(m_panel5, _("SSH Client"), false, m_panel5ImgIndex); wxBoxSizer* bSizer161 = new wxBoxSizer(wxVERTICAL); @@ -416,13 +428,14 @@ SvnPreferencesDialogBase::SvnPreferencesDialogBase(wxWindow* parent, wxWindowID fgSizer6->Add(m_staticText20, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5); m_textCtrlSSHClient = new wxTextCtrl(m_panel5, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0); + m_textCtrlSSHClient->SetFocus(); #if wxVERSION_NUMBER >= 3000 m_textCtrlSSHClient->SetHint(wxT("")); #endif - fgSizer6->Add(m_textCtrlSSHClient, 0, wxALL|wxEXPAND, 5); + fgSizer6->Add(m_textCtrlSSHClient, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5); - m_button12 = new wxButton(m_panel5, wxID_ANY, _("Browse"), wxDefaultPosition, wxSize(-1, -1), 0); + m_button12 = new wxButton(m_panel5, wxID_ANY, _("..."), wxDefaultPosition, wxSize(-1, -1), wxBU_EXACTFIT); fgSizer6->Add(m_button12, 0, wxALL, 5); @@ -435,7 +448,7 @@ SvnPreferencesDialogBase::SvnPreferencesDialogBase(wxWindow* parent, wxWindowID m_textCtrlSshClientArgs->SetHint(wxT("")); #endif - fgSizer6->Add(m_textCtrlSshClientArgs, 0, wxALL|wxEXPAND, 5); + fgSizer6->Add(m_textCtrlSshClientArgs, 0, wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5); wxStaticBoxSizer* sbSizer2 = new wxStaticBoxSizer( new wxStaticBox(m_panel5, wxID_ANY, wxT("")), wxVERTICAL); @@ -447,7 +460,7 @@ SvnPreferencesDialogBase::SvnPreferencesDialogBase(wxWindow* parent, wxWindowID m_panel6 = new wxPanel(m_treebook1, wxID_ANY, wxDefaultPosition, wxSize(-1, -1), wxTAB_TRAVERSAL); int m_panel6ImgIndex; - m_panel6ImgIndex = m_treebook1_il->Add(wxXmlResource::Get()->LoadBitmap(wxT("integration"))); + m_panel6ImgIndex = m_treebook1_il->Add(wxXmlResource::Get()->LoadBitmap(wxT("16-connected"))); m_treebook1->AddPage(m_panel6, _("Integration"), false, m_panel6ImgIndex); wxBoxSizer* bSizer23 = new wxBoxSizer(wxVERTICAL); @@ -468,14 +481,14 @@ SvnPreferencesDialogBase::SvnPreferencesDialogBase(wxWindow* parent, wxWindowID m_staticText29 = new wxStaticText(m_panel6, wxID_ANY, _("Preprocessor name:"), wxDefaultPosition, wxSize(-1, -1), 0); - bSizer24->Add(m_staticText29, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5); + bSizer24->Add(m_staticText29, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5); m_textCtrlMacroName = new wxTextCtrl(m_panel6, wxID_ANY, wxT("SVN_REVISION"), wxDefaultPosition, wxSize(-1, -1), 0); #if wxVERSION_NUMBER >= 3000 m_textCtrlMacroName->SetHint(wxT("")); #endif - bSizer24->Add(m_textCtrlMacroName, 1, wxALL|wxEXPAND, 5); + bSizer24->Add(m_textCtrlMacroName, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5); wxBoxSizer* bSizer13 = new wxBoxSizer(wxHORIZONTAL); @@ -504,11 +517,16 @@ SvnPreferencesDialogBase::SvnPreferencesDialogBase(wxWindow* parent, wxWindowID m_treebook1->ExpandNode( 3, true ); SetName(wxT("SvnPreferencesDialogBase")); - SetSizeHints(-1,-1); - if ( GetSizer() ) { + SetMinClientSize(wxSize(400,250)); + SetSize(-1,-1); + if (GetSizer()) { GetSizer()->Fit(this); } - CentreOnParent(wxBOTH); + if(GetParent()) { + CentreOnParent(wxBOTH); + } else { + CentreOnScreen(wxBOTH); + } #if wxVERSION_NUMBER >= 2900 if(!wxPersistenceManager::Get().Find(this)) { wxPersistenceManager::Get().RegisterAndRestore(this); @@ -647,11 +665,15 @@ SvnInfoDialogBase::SvnInfoDialogBase(wxWindow* parent, wxWindowID id, const wxSt bSizer18->Add(m_button13, 0, wxALL, 5); SetName(wxT("SvnInfoDialogBase")); - SetSizeHints(-1,-1); - if ( GetSizer() ) { + SetSize(-1,-1); + if (GetSizer()) { GetSizer()->Fit(this); } - CentreOnParent(wxBOTH); + if(GetParent()) { + CentreOnParent(wxBOTH); + } else { + CentreOnScreen(wxBOTH); + } #if wxVERSION_NUMBER >= 2900 if(!wxPersistenceManager::Get().Find(this)) { wxPersistenceManager::Get().RegisterAndRestore(this); @@ -734,11 +756,15 @@ SvnCheckoutDialogBase::SvnCheckoutDialogBase(wxWindow* parent, wxWindowID id, co bSizer20->Add(m_button15, 0, wxALL, 5); SetName(wxT("SvnCheckoutDialogBase")); - SetSizeHints(-1,-1); - if ( GetSizer() ) { + SetSize(-1,-1); + if (GetSizer()) { GetSizer()->Fit(this); } - CentreOnParent(wxBOTH); + if(GetParent()) { + CentreOnParent(wxBOTH); + } else { + CentreOnScreen(wxBOTH); + } #if wxVERSION_NUMBER >= 2900 if(!wxPersistenceManager::Get().Find(this)) { wxPersistenceManager::Get().RegisterAndRestore(this); @@ -824,11 +850,15 @@ SvnLogDialogBase::SvnLogDialogBase(wxWindow* parent, wxWindowID id, const wxStri bSizer22->Add(m_button18, 0, wxALL, 5); SetName(wxT("SvnLogDialogBase")); - SetSizeHints(-1,-1); - if ( GetSizer() ) { + SetSize(-1,-1); + if (GetSizer()) { GetSizer()->Fit(this); } - CentreOnParent(wxBOTH); + if(GetParent()) { + CentreOnParent(wxBOTH); + } else { + CentreOnScreen(wxBOTH); + } #if wxVERSION_NUMBER >= 2900 if(!wxPersistenceManager::Get().Find(this)) { wxPersistenceManager::Get().RegisterAndRestore(this); @@ -906,11 +936,15 @@ DiffDialogBase::DiffDialogBase(wxWindow* parent, wxWindowID id, const wxString& bSizer26->Add(m_button19, 0, wxALL, 5); SetName(wxT("DiffDialogBase")); - SetSizeHints(-1,-1); - if ( GetSizer() ) { + SetSize(-1,-1); + if (GetSizer()) { GetSizer()->Fit(this); } - CentreOnParent(wxBOTH); + if(GetParent()) { + CentreOnParent(wxBOTH); + } else { + CentreOnScreen(wxBOTH); + } #if wxVERSION_NUMBER >= 2900 if(!wxPersistenceManager::Get().Find(this)) { wxPersistenceManager::Get().RegisterAndRestore(this); @@ -951,11 +985,10 @@ ChangeLogPageBase::ChangeLogPageBase(wxWindow* parent, wxWindowID id, const wxPo bSizer27->Add(m_textCtrl, 1, wxALL|wxEXPAND, 5); SetName(wxT("ChangeLogPageBase")); - SetSizeHints(500,300); - if ( GetSizer() ) { + SetSize(500,300); + if (GetSizer()) { GetSizer()->Fit(this); } - CentreOnParent(wxBOTH); // Connect events m_textCtrl->Connect(wxEVT_COMMAND_TEXT_URL, wxCommandEventHandler(ChangeLogPageBase::OnURL), NULL, this); @@ -1063,11 +1096,15 @@ SvnPropsBaseDlg::SvnPropsBaseDlg(wxWindow* parent, wxWindowID id, const wxString bSizer29->Add(m_button22, 0, wxALL, 5); SetName(wxT("SvnPropsBaseDlg")); - SetSizeHints(-1,-1); - if ( GetSizer() ) { + SetSize(-1,-1); + if (GetSizer()) { GetSizer()->Fit(this); } - CentreOnParent(wxBOTH); + if(GetParent()) { + CentreOnParent(wxBOTH); + } else { + CentreOnScreen(wxBOTH); + } #if wxVERSION_NUMBER >= 2900 if(!wxPersistenceManager::Get().Find(this)) { wxPersistenceManager::Get().RegisterAndRestore(this); @@ -1101,7 +1138,8 @@ PatchDlgBase::PatchDlgBase(wxWindow* parent, wxWindowID id, const wxString& titl bSizer31->Add(fgSizer11, 1, wxALL|wxEXPAND, 5); - m_filePicker = new wxFilePickerCtrl(this, wxID_ANY, wxEmptyString, _("Select a file"), wxT("Patch files (*.patch;*.diff)|*.patch;*.diff|All Files (*)|*"), wxDefaultPosition, wxSize(-1, -1), wxFLP_DEFAULT_STYLE); + m_filePicker = new wxFilePickerCtrl(this, wxID_ANY, wxEmptyString, _("Select a file"), wxT("Patch files (*.patch;*.diff)|*.patch;*.diff|All Files (*)|*"), wxDefaultPosition, wxSize(-1, -1), wxFLP_DEFAULT_STYLE|wxFLP_USE_TEXTCTRL|wxFLP_SMALL); + m_filePicker->SetFocus(); fgSizer11->Add(m_filePicker, 0, wxALL|wxEXPAND, 5); @@ -1127,11 +1165,15 @@ PatchDlgBase::PatchDlgBase(wxWindow* parent, wxWindowID id, const wxString& titl m_stdBtnSizer33->Realize(); SetName(wxT("PatchDlgBase")); - SetSizeHints(-1,-1); - if ( GetSizer() ) { + SetSize(-1,-1); + if (GetSizer()) { GetSizer()->Fit(this); } - CentreOnParent(wxBOTH); + if(GetParent()) { + CentreOnParent(wxBOTH); + } else { + CentreOnScreen(wxBOTH); + } #if wxVERSION_NUMBER >= 2900 if(!wxPersistenceManager::Get().Find(this)) { wxPersistenceManager::Get().RegisterAndRestore(this); @@ -1195,11 +1237,15 @@ SvnSelectLocalRepoBase::SvnSelectLocalRepoBase(wxWindow* parent, wxWindowID id, m_stdBtnSizer39->Realize(); SetName(wxT("SvnSelectLocalRepoBase")); - SetSizeHints(-1,-1); - if ( GetSizer() ) { + SetSize(-1,-1); + if (GetSizer()) { GetSizer()->Fit(this); } - CentreOnParent(wxBOTH); + if(GetParent()) { + CentreOnParent(wxBOTH); + } else { + CentreOnScreen(wxBOTH); + } #if wxVERSION_NUMBER >= 2900 if(!wxPersistenceManager::Get().Find(this)) { wxPersistenceManager::Get().RegisterAndRestore(this); @@ -1290,11 +1336,15 @@ SvnBlameFrameBase::SvnBlameFrameBase(wxWindow* parent, wxWindowID id, const wxSt boxSizer13->Add(m_stc, 1, wxALL|wxEXPAND, 5); SetName(wxT("SvnBlameFrameBase")); - SetSizeHints(-1,-1); - if ( GetSizer() ) { + SetSize(-1,-1); + if (GetSizer()) { GetSizer()->Fit(this); } - CentreOnParent(wxBOTH); + if(GetParent()) { + CentreOnParent(wxBOTH); + } else { + CentreOnScreen(wxBOTH); + } #if wxVERSION_NUMBER >= 2900 if(!wxPersistenceManager::Get().Find(this)) { wxPersistenceManager::Get().RegisterAndRestore(this); diff --git a/Subversion2/subversion2_ui.h b/Subversion2/subversion2_ui.h index 2aab9d9a49..1ee4a5790f 100644 --- a/Subversion2/subversion2_ui.h +++ b/Subversion2/subversion2_ui.h @@ -94,7 +94,7 @@ class SvnCopyDialogBase : public wxDialog wxTextCtrl* GetTextCtrlComment() { return m_textCtrlComment; } wxButton* GetButton4() { return m_button4; } wxButton* GetButton5() { return m_button5; } - SvnCopyDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Create Svn Tag"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(575,315), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER); + SvnCopyDialogBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Create Svn Tag"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(-1,-1), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER); virtual ~SvnCopyDialogBase(); }; diff --git a/Subversion2/subversion_view.cpp b/Subversion2/subversion_view.cpp index 45aa284282..d9182425f3 100644 --- a/Subversion2/subversion_view.cpp +++ b/Subversion2/subversion_view.cpp @@ -253,40 +253,32 @@ void SubversionView::CreatGUIControls() wxAuiToolBar* tb = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_PLAIN_BACKGROUND); tb->AddTool(XRCID("svn_link_editor"), _("Link Editor"), - wxXmlResource::Get()->LoadBitmap(wxT("link_editor")), + bmpLdr->LoadBitmap(wxT("link_editor")), _("Link Editor"), wxITEM_CHECK); tb->ToggleTool(XRCID("svn_link_editor"), m_plugin->GetSettings().GetFlags() & SvnLinkEditor); tb->AddTool(XRCID("svn_open_local_repo_browser"), _("Select a Directory to View..."), - bmpLdr->LoadBitmap(wxT("toolbars/16/standard/file_open")), + bmpLdr->LoadBitmap("folder"), _("Select a Directory to View..."), wxITEM_NORMAL); tb->AddSeparator(); - tb->AddTool(XRCID("svn_stop"), - _("Stop current svn process"), - bmpLdr->LoadBitmap(wxT("subversion/16/stop")), - _("Stop current svn process")); tb->AddTool( - XRCID("svn_cleanup"), _("Svn Cleanup"), bmpLdr->LoadBitmap(wxT("subversion/16/cleanup")), _("Svn Cleanup")); + XRCID("svn_stop"), _("Stop current svn process"), bmpLdr->LoadBitmap("stop"), _("Stop current svn process")); + tb->AddTool(XRCID("svn_cleanup"), _("Svn Cleanup"), bmpLdr->LoadBitmap("clean"), _("Svn Cleanup")); tb->AddSeparator(); - tb->AddTool( - XRCID("svn_checkout"), _("Svn Checkout"), bmpLdr->LoadBitmap(wxT("subversion/16/checkout")), _("Svn Checkout")); + tb->AddTool(XRCID("svn_checkout"), _("Svn Checkout"), bmpLdr->LoadBitmap("next"), _("Svn Checkout")); tb->AddSeparator(); - tb->AddTool( - XRCID("svn_refresh"), _("Refresh View"), bmpLdr->LoadBitmap(wxT("subversion/16/refresh")), _("Refresh View")); + tb->AddTool(XRCID("svn_refresh"), _("Refresh View"), bmpLdr->LoadBitmap("debugger_restart"), _("Refresh View")); tb->AddSeparator(); tb->AddTool(XRCID("clear_svn_output"), _("Clear Svn Output Tab"), - bmpLdr->LoadBitmap(wxT("output-pane/16/clear")), + bmpLdr->LoadBitmap("clear"), _("Clear Svn Output Tab"), wxITEM_NORMAL); - tb->AddTool(XRCID("svn_settings"), - _("Svn Settings..."), - bmpLdr->LoadBitmap(wxT("subversion/16/settings")), - _("Svn Settings...")); - tb->AddTool(XRCID("svn_info"), _("Svn Info"), bmpLdr->LoadBitmap(wxT("subversion/16/info")), _("Svn Info")); + tb->AddTool(XRCID("svn_settings"), _("Svn Settings..."), bmpLdr->LoadBitmap("cog"), _("Svn Settings...")); + tb->AddTool(XRCID("svn_info"), _("Svn Info"), bmpLdr->LoadBitmap("info"), _("Svn Info")); tb->Connect(XRCID("clear_svn_output"), wxEVT_COMMAND_MENU_SELECTED, diff --git a/bitmaps/16-connected.png b/bitmaps/16-connected.png new file mode 100644 index 0000000000..26dcf975c9 Binary files /dev/null and b/bitmaps/16-connected.png differ diff --git a/bitmaps/16-connected@2x.png b/bitmaps/16-connected@2x.png new file mode 100644 index 0000000000..2b9bef4cde Binary files /dev/null and b/bitmaps/16-connected@2x.png differ diff --git a/bitmaps/16-diff.png b/bitmaps/16-diff.png new file mode 100644 index 0000000000..f44243ec4d Binary files /dev/null and b/bitmaps/16-diff.png differ diff --git a/bitmaps/16-diff@2x.png b/bitmaps/16-diff@2x.png new file mode 100644 index 0000000000..fb9873e567 Binary files /dev/null and b/bitmaps/16-diff@2x.png differ diff --git a/bitmaps/16-disconnected.png b/bitmaps/16-disconnected.png new file mode 100644 index 0000000000..3c2e2effa2 Binary files /dev/null and b/bitmaps/16-disconnected.png differ diff --git a/bitmaps/16-disconnected@2x.png b/bitmaps/16-disconnected@2x.png new file mode 100644 index 0000000000..f2ef0068ec Binary files /dev/null and b/bitmaps/16-disconnected@2x.png differ diff --git a/bitmaps/16-folder.png b/bitmaps/16-folder.png new file mode 100644 index 0000000000..3ad50b694e Binary files /dev/null and b/bitmaps/16-folder.png differ diff --git a/bitmaps/16-folder@2x.png b/bitmaps/16-folder@2x.png new file mode 100644 index 0000000000..78a0f78a23 Binary files /dev/null and b/bitmaps/16-folder@2x.png differ diff --git a/bitmaps/16-help.png b/bitmaps/16-help.png new file mode 100644 index 0000000000..99b721ea4a Binary files /dev/null and b/bitmaps/16-help.png differ diff --git a/bitmaps/16-help@2x.png b/bitmaps/16-help@2x.png new file mode 100644 index 0000000000..c307932b21 Binary files /dev/null and b/bitmaps/16-help@2x.png differ diff --git a/bitmaps/16-info.png b/bitmaps/16-info.png new file mode 100644 index 0000000000..730e6df83d Binary files /dev/null and b/bitmaps/16-info.png differ diff --git a/bitmaps/16-info@2x.png b/bitmaps/16-info@2x.png new file mode 100644 index 0000000000..69eef570e4 Binary files /dev/null and b/bitmaps/16-info@2x.png differ diff --git a/bitmaps/16-lock.png b/bitmaps/16-lock.png new file mode 100644 index 0000000000..f0c5fe9fb4 Binary files /dev/null and b/bitmaps/16-lock.png differ diff --git a/bitmaps/16-lock@2x.png b/bitmaps/16-lock@2x.png new file mode 100644 index 0000000000..171a59fa84 Binary files /dev/null and b/bitmaps/16-lock@2x.png differ diff --git a/bitmaps/16-log.png b/bitmaps/16-log.png new file mode 100644 index 0000000000..02f64eb5a8 Binary files /dev/null and b/bitmaps/16-log.png differ diff --git a/bitmaps/16-log@2x.png b/bitmaps/16-log@2x.png new file mode 100644 index 0000000000..94ce0fec45 Binary files /dev/null and b/bitmaps/16-log@2x.png differ diff --git a/bitmaps/16-mark_word.png b/bitmaps/16-mark_word.png index 22f8dc2a65..b058089be8 100644 Binary files a/bitmaps/16-mark_word.png and b/bitmaps/16-mark_word.png differ diff --git a/bitmaps/16-mark_word@2x.png b/bitmaps/16-mark_word@2x.png index 9a951c573d..ea506bba04 100644 Binary files a/bitmaps/16-mark_word@2x.png and b/bitmaps/16-mark_word@2x.png differ diff --git a/bitmaps/16-minus.png b/bitmaps/16-minus.png new file mode 100644 index 0000000000..c2debc2d71 Binary files /dev/null and b/bitmaps/16-minus.png differ diff --git a/bitmaps/16-minus@2x.png b/bitmaps/16-minus@2x.png new file mode 100644 index 0000000000..c292eb08a9 Binary files /dev/null and b/bitmaps/16-minus@2x.png differ diff --git a/bitmaps/16-ok.png b/bitmaps/16-ok.png new file mode 100644 index 0000000000..b730b5ccf5 Binary files /dev/null and b/bitmaps/16-ok.png differ diff --git a/bitmaps/16-ok@2x.png b/bitmaps/16-ok@2x.png new file mode 100644 index 0000000000..7e3a5a546c Binary files /dev/null and b/bitmaps/16-ok@2x.png differ diff --git a/bitmaps/16-plus.png b/bitmaps/16-plus.png new file mode 100644 index 0000000000..1f528a2af2 Binary files /dev/null and b/bitmaps/16-plus.png differ diff --git a/bitmaps/16-plus@2x.png b/bitmaps/16-plus@2x.png new file mode 100644 index 0000000000..3296e2f0f4 Binary files /dev/null and b/bitmaps/16-plus@2x.png differ diff --git a/bitmaps/16-tasks.png b/bitmaps/16-tasks.png new file mode 100644 index 0000000000..c68f40fb08 Binary files /dev/null and b/bitmaps/16-tasks.png differ diff --git a/bitmaps/16-tasks@2x.png b/bitmaps/16-tasks@2x.png new file mode 100644 index 0000000000..4488acffcc Binary files /dev/null and b/bitmaps/16-tasks@2x.png differ diff --git a/bitmaps/16-tools.png b/bitmaps/16-tools.png new file mode 100644 index 0000000000..0344d8ac0b Binary files /dev/null and b/bitmaps/16-tools.png differ diff --git a/bitmaps/16-tools@2x.png b/bitmaps/16-tools@2x.png new file mode 100644 index 0000000000..bf422eaadb Binary files /dev/null and b/bitmaps/16-tools@2x.png differ diff --git a/bitmaps/24-connected.png b/bitmaps/24-connected.png new file mode 100644 index 0000000000..9c6011b8e0 Binary files /dev/null and b/bitmaps/24-connected.png differ diff --git a/bitmaps/24-connected@2x.png b/bitmaps/24-connected@2x.png new file mode 100644 index 0000000000..37a38a46d5 Binary files /dev/null and b/bitmaps/24-connected@2x.png differ diff --git a/bitmaps/24-diff.png b/bitmaps/24-diff.png new file mode 100644 index 0000000000..fb23505b13 Binary files /dev/null and b/bitmaps/24-diff.png differ diff --git a/bitmaps/24-diff@2x.png b/bitmaps/24-diff@2x.png new file mode 100644 index 0000000000..ec11f4a9c4 Binary files /dev/null and b/bitmaps/24-diff@2x.png differ diff --git a/bitmaps/24-disconnected.png b/bitmaps/24-disconnected.png new file mode 100644 index 0000000000..75eb682d97 Binary files /dev/null and b/bitmaps/24-disconnected.png differ diff --git a/bitmaps/24-disconnected@2x.png b/bitmaps/24-disconnected@2x.png new file mode 100644 index 0000000000..9476651d0f Binary files /dev/null and b/bitmaps/24-disconnected@2x.png differ diff --git a/bitmaps/24-folder.png b/bitmaps/24-folder.png new file mode 100644 index 0000000000..138099fe2a Binary files /dev/null and b/bitmaps/24-folder.png differ diff --git a/bitmaps/24-folder@2x.png b/bitmaps/24-folder@2x.png new file mode 100644 index 0000000000..2885f9c70d Binary files /dev/null and b/bitmaps/24-folder@2x.png differ diff --git a/bitmaps/24-help.png b/bitmaps/24-help.png new file mode 100644 index 0000000000..60304edf5a Binary files /dev/null and b/bitmaps/24-help.png differ diff --git a/bitmaps/24-help@2x.png b/bitmaps/24-help@2x.png new file mode 100644 index 0000000000..5a41e2d95c Binary files /dev/null and b/bitmaps/24-help@2x.png differ diff --git a/bitmaps/24-info.png b/bitmaps/24-info.png new file mode 100644 index 0000000000..539573eea6 Binary files /dev/null and b/bitmaps/24-info.png differ diff --git a/bitmaps/24-info@2x.png b/bitmaps/24-info@2x.png new file mode 100644 index 0000000000..6184a4cf76 Binary files /dev/null and b/bitmaps/24-info@2x.png differ diff --git a/bitmaps/24-lock.png b/bitmaps/24-lock.png new file mode 100644 index 0000000000..5b162ab2ed Binary files /dev/null and b/bitmaps/24-lock.png differ diff --git a/bitmaps/24-lock@2x.png b/bitmaps/24-lock@2x.png new file mode 100644 index 0000000000..4d710f43d8 Binary files /dev/null and b/bitmaps/24-lock@2x.png differ diff --git a/bitmaps/24-log.png b/bitmaps/24-log.png new file mode 100644 index 0000000000..0cf56cb664 Binary files /dev/null and b/bitmaps/24-log.png differ diff --git a/bitmaps/24-log@2x.png b/bitmaps/24-log@2x.png new file mode 100644 index 0000000000..3ecfecf6c9 Binary files /dev/null and b/bitmaps/24-log@2x.png differ diff --git a/bitmaps/24-mark_word.png b/bitmaps/24-mark_word.png index b7a37d7a7b..64163ebe21 100644 Binary files a/bitmaps/24-mark_word.png and b/bitmaps/24-mark_word.png differ diff --git a/bitmaps/24-mark_word@2x.png b/bitmaps/24-mark_word@2x.png index 1d37a807d5..68be6f19d0 100644 Binary files a/bitmaps/24-mark_word@2x.png and b/bitmaps/24-mark_word@2x.png differ diff --git a/bitmaps/24-minus.png b/bitmaps/24-minus.png new file mode 100644 index 0000000000..edf065c83b Binary files /dev/null and b/bitmaps/24-minus.png differ diff --git a/bitmaps/24-minus@2x.png b/bitmaps/24-minus@2x.png new file mode 100644 index 0000000000..79ceaea886 Binary files /dev/null and b/bitmaps/24-minus@2x.png differ diff --git a/bitmaps/24-ok.png b/bitmaps/24-ok.png new file mode 100644 index 0000000000..477104127c Binary files /dev/null and b/bitmaps/24-ok.png differ diff --git a/bitmaps/24-ok@2x.png b/bitmaps/24-ok@2x.png new file mode 100644 index 0000000000..e12779b89d Binary files /dev/null and b/bitmaps/24-ok@2x.png differ diff --git a/bitmaps/24-plus.png b/bitmaps/24-plus.png new file mode 100644 index 0000000000..1fc8d644d2 Binary files /dev/null and b/bitmaps/24-plus.png differ diff --git a/bitmaps/24-plus@2x.png b/bitmaps/24-plus@2x.png new file mode 100644 index 0000000000..92eb7e97b4 Binary files /dev/null and b/bitmaps/24-plus@2x.png differ diff --git a/bitmaps/24-tasks.png b/bitmaps/24-tasks.png new file mode 100644 index 0000000000..dfa3f6d8f2 Binary files /dev/null and b/bitmaps/24-tasks.png differ diff --git a/bitmaps/24-tasks@2x.png b/bitmaps/24-tasks@2x.png new file mode 100644 index 0000000000..dd5537e91e Binary files /dev/null and b/bitmaps/24-tasks@2x.png differ diff --git a/bitmaps/24-tools.png b/bitmaps/24-tools.png new file mode 100644 index 0000000000..c0d1398306 Binary files /dev/null and b/bitmaps/24-tools.png differ diff --git a/bitmaps/24-tools@2x.png b/bitmaps/24-tools@2x.png new file mode 100644 index 0000000000..31ba106247 Binary files /dev/null and b/bitmaps/24-tools@2x.png differ diff --git a/svgs/connected.svg b/svgs/connected.svg new file mode 100644 index 0000000000..78c362d374 --- /dev/null +++ b/svgs/connected.svg @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/svgs/create-humanity-icons.php b/svgs/create-humanity-icons.php index 8f360966bc..380b2a96f7 100644 --- a/svgs/create-humanity-icons.php +++ b/svgs/create-humanity-icons.php @@ -42,7 +42,8 @@ public function copy() { $IN_FILES[] = new ImageFile("actions\\24\\gtk-edit.svg", "find_and_replace.svg"); $IN_FILES[] = new ImageFile("places\\24\\folder-saved-search.svg", "find_in_files.svg"); $IN_FILES[] = new ImageFile("places\\24\\folder-documents.svg", "open_resource.svg"); -$IN_FILES[] = new ImageFile("apps\\24\\menu-editor.svg", "mark_word.svg"); +$IN_FILES[] = new ImageFile("categories\\24\\applications-graphics.svg", "mark_word.svg"); + // Build $IN_FILES[] = new ImageFile("mimes\\24\\text-x-install.svg", "build.svg"); @@ -71,6 +72,21 @@ public function copy() { $IN_FILES[] = new ImageFile("actions\\24\\system-run.svg", "dll.svg"); $IN_FILES[] = new ImageFile("apps\\24\\utilities-terminal.svg", "console.svg"); $IN_FILES[] = new ImageFile("mimes\\24\\multipart-encrypted.svg", "binary-file.svg"); +$IN_FILES[] = new ImageFile("apps\\24\\logviewer.svg", "log.svg"); +$IN_FILES[] = new ImageFile("apps\\24\\evolution-tasks.svg", "tasks.svg"); +$IN_FILES[] = new ImageFile("apps\\24\\gnome-session-switch.svg", "diff.svg"); +$IN_FILES[] = new ImageFile("status\\24\\locked.svg", "lock.svg"); +$IN_FILES[] = new ImageFile("actions\\24\\help-contents.svg", "help.svg"); +$IN_FILES[] = new ImageFile("actions\\24\\gtk-info.svg", "info.svg"); +$IN_FILES[] = new ImageFile("actions\\24\\dialog-apply.svg", "ok.svg"); +$IN_FILES[] = new ImageFile("actions\\24\\list-add.svg", "plus.svg"); +$IN_FILES[] = new ImageFile("actions\\24\\list-remove.svg", "minus.svg"); +$IN_FILES[] = new ImageFile("categories\\24\\applications-engineering.svg", "tools.svg"); +$IN_FILES[] = new ImageFile("status\\24\\network-offline.svg", "disconnected.svg"); +$IN_FILES[] = new ImageFile("status\\24\\network-transmit-receive.svg", "connected.svg"); + +// Mime type +$IN_FILES[] = new ImageFile("places\\24\\folder.svg", "folder.svg"); /** @var ImageFile */ foreach($IN_FILES as $file) { diff --git a/svgs/diff.svg b/svgs/diff.svg new file mode 100644 index 0000000000..849f445c4e --- /dev/null +++ b/svgs/diff.svg @@ -0,0 +1,230 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/svgs/disconnected.svg b/svgs/disconnected.svg new file mode 100644 index 0000000000..d05d3a1d34 --- /dev/null +++ b/svgs/disconnected.svg @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/svgs/folder.svg b/svgs/folder.svg new file mode 100644 index 0000000000..3da0890e77 --- /dev/null +++ b/svgs/folder.svg @@ -0,0 +1,442 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svgs/help.svg b/svgs/help.svg new file mode 100644 index 0000000000..47b36e8f7d --- /dev/null +++ b/svgs/help.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svgs/info.svg b/svgs/info.svg new file mode 100644 index 0000000000..030941b34a --- /dev/null +++ b/svgs/info.svg @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svgs/lock.svg b/svgs/lock.svg new file mode 100644 index 0000000000..391ce01095 --- /dev/null +++ b/svgs/lock.svg @@ -0,0 +1,301 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svgs/log.svg b/svgs/log.svg new file mode 100644 index 0000000000..0993ce847c --- /dev/null +++ b/svgs/log.svg @@ -0,0 +1,309 @@ + + + + + Optical Drive + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svgs/mark_word.svg b/svgs/mark_word.svg index c28c0d83af..bf2be34a75 100644 --- a/svgs/mark_word.svg +++ b/svgs/mark_word.svg @@ -1,373 +1,318 @@ + - - - - image/svg+xml - - - - - + id="svg11300"> - + - + id="linearGradient6975"> + offset="0" /> + + id="linearGradient6468"> + id="linearGradient6951"> + + + id="linearGradient6963"> - - - - + id="stop6967" + style="stop-color:black;stop-opacity:1" + offset="1" /> + + + id="stop6631" + style="stop-color:#aeaeae;stop-opacity:1" + offset="0" /> + id="linearGradient6651"> + id="linearGradient6835"> + id="linearGradient4103"> - + id="linearGradient5113"> - + gradientTransform="matrix(0.2222274,0,0,0.2666668,4.7775344,-3.866673)" /> + gradientTransform="matrix(1,0,0,1.6250001,0.9999965,-8.0625028)" /> + gradientTransform="matrix(0.4058776,0,0,0.3916624,-7.7895373,5.0489042)" /> + gradientTransform="matrix(0.4429464,0,0,0.4135479,-6.2382742,-12.648518)" /> - + + gradientTransform="matrix(0.5426759,0,0,0.3373739,-15.797589,7.3326889)" /> + gradientTransform="matrix(0.6546131,0,0,0.4343892,-22.336979,6.2419012)" /> + + gradientTransform="matrix(0.472086,0,0,0.4751232,-2.0094528,2.0966293)" /> + gradientTransform="matrix(0.4925112,0,0,0.5272088,-1.7832111,-0.3189141)" /> + gradientTransform="matrix(0.492941,0,0,0.5186452,-1.7923829,-0.0285044)" /> - - - - - - - - - - + id="g6084"> + + + + + + + + + width="10.995647" + height="1.9956478" + rx="0.48656639" + ry="0.44909146" + x="11.502172" + y="20.502176" + id="rect8653" + style="fill:url(#linearGradient5539);fill-opacity:1;fill-rule:nonzero;stroke:#828282;stroke-width:1.00435174;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" /> + d="m 13.001997,10.769723 c 1.250709,-0.603413 5.666291,-0.462811 8.082999,2.75e-4 L 19.892862,9.2469138 c -1.641669,-0.3426379 -3.814745,-0.4457914 -5.774342,0 l -1.116523,1.5228092 z" + id="path8655" + style="fill:#f0f0f0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" /> + d="M 13.70926,21.499566 13.500428,10.859181 14.396469,9.6997436 c 1.024682,-0.2657522 4.189539,-0.2657522 5.115021,0 l 0.988074,1.1594374 -0.08174,10.627626 -6.708562,0.01276 z" + id="path8651" + style="opacity:0.6;fill:none;stroke:url(#radialGradient5535);stroke-width:1.00086355;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" /> + - + transform="matrix(0.5339967,0,0,0.5863235,-1.8849934,-0.0838479)" + id="g8659" + style="opacity:0.57777782;stroke-width:2.19232106;stroke-miterlimit:4;stroke-dasharray:none"> + d="m 29.747356,8.8417702 0,3.2400348 c 0,0 1.386165,-0.08252 2.246684,-0.09616 l 0,-3.3149303 c -1.160303,0.025805 -2.246684,0.1710515 -2.246684,0.1710515 z" + id="path8663" + style="fill:#e6e7e6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.19232106;marker:none;visibility:visible;display:inline;overflow:visible" /> - - + d="m 34.240516,8.7721984 0,3.2952776 c 0,0 1.260992,-0.0052 2.246892,0.01433 l 0,-3.337027 c -1.135348,-0.051535 -2.246892,0.02742 -2.246892,0.02742 z" + id="path8665" + style="opacity:0.44444448;fill:#e6e7e6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.19232106;marker:none;visibility:visible;display:inline;overflow:visible" /> + diff --git a/svgs/minus.svg b/svgs/minus.svg new file mode 100644 index 0000000000..1aea019e09 --- /dev/null +++ b/svgs/minus.svg @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svgs/ok.svg b/svgs/ok.svg new file mode 100644 index 0000000000..c6687aac81 --- /dev/null +++ b/svgs/ok.svg @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svgs/plus.svg b/svgs/plus.svg new file mode 100644 index 0000000000..c18a015496 --- /dev/null +++ b/svgs/plus.svg @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svgs/tasks.svg b/svgs/tasks.svg new file mode 100644 index 0000000000..b4ba2a1e0d --- /dev/null +++ b/svgs/tasks.svg @@ -0,0 +1,419 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/svgs/tools.svg b/svgs/tools.svg new file mode 100644 index 0000000000..78d45b640d --- /dev/null +++ b/svgs/tools.svg @@ -0,0 +1,337 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +