From 2dd736abcecf4070e1a3ff21b184721efcc33f4d Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 18 Dec 2008 00:58:06 -0700 Subject: Moved common options out of Advanced --- linden/indra/newview/app_settings/settings.xml | 13 +----- linden/indra/newview/llfloatersnapshot.cpp | 47 +++++++++++++++++++++- linden/indra/newview/llviewermenu.cpp | 32 +-------------- linden/indra/newview/llviewerwindow.cpp | 4 -- .../skins/default/xui/en-us/floater_snapshot.xml | 2 + .../skins/default/xui/en-us/menu_viewer.xml | 34 +++++----------- .../default/xui/en-us/panel_preferences_input.xml | 11 +++-- 7 files changed, 67 insertions(+), 76 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index ca3dd81..2035b85 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -1849,17 +1849,6 @@ 0 - CompressSnapshotsToDisk - - Comment - Compress snapshots saved to disk (Using JPEG 2000) - Persist - 1 - Type - Boolean - Value - 0 - ConnectAsGod Comment @@ -4387,7 +4376,7 @@ Type Boolean Value - 0 + 1 LipSyncOoh diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp index 954bf9f..6e66103 100644 --- a/linden/indra/newview/llfloatersnapshot.cpp +++ b/linden/indra/newview/llfloatersnapshot.cpp @@ -992,6 +992,7 @@ public: static void onClickLess(void* data) ; static void onClickMore(void* data) ; static void onClickUICheck(LLUICtrl *ctrl, void* data); + static void onClickHighResCheck(LLUICtrl *ctrl, void* data); static void onClickHUDCheck(LLUICtrl *ctrl, void* data); static void onClickKeepOpenCheck(LLUICtrl *ctrl, void* data); static void onClickKeepAspectCheck(LLUICtrl *ctrl, void* data); @@ -1105,6 +1106,10 @@ void LLFloaterSnapshot::Impl::updateLayout(LLFloaterSnapshot* floaterp) { LLSnapshotLivePreview* previewp = getPreviewView(floaterp); + LLSnapshotLivePreview::ESnapshotType shot_type = getTypeIndex(floaterp); + if (shot_type != LLSnapshotLivePreview::SNAPSHOT_LOCAL) + gSavedSettings.setBOOL("HighResSnapshot", FALSE); + S32 delta_height = gSavedSettings.getBOOL("AdvanceSnapshot") ? 0 : floaterp->getUIWinHeightShort() - floaterp->getUIWinHeightLong() ; LLComboBox* combo; @@ -1234,6 +1239,7 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater) floater->childSetVisible("snapshot_height", is_advance); floater->childSetVisible("keep_aspect_check", is_advance); floater->childSetVisible("ui_check", is_advance); + floater->childSetVisible("high_res_check", is_advance && is_local); floater->childSetVisible("hud_check", is_advance); floater->childSetVisible("keep_open_check", is_advance); floater->childSetVisible("freeze_frame_check", is_advance); @@ -1246,7 +1252,7 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater) layer_type = LLViewerWindow::SNAPSHOT_TYPE_COLOR; floater->childSetValue("layer_types", "colors"); if(is_advance) - { + { setResolution(floater, "postcard_size_combo"); } break; @@ -1434,7 +1440,26 @@ void LLFloaterSnapshot::Impl::onClickUICheck(LLUICtrl *ctrl, void* data) LLFloaterSnapshot *view = (LLFloaterSnapshot *)data; if (view) + { + BOOL high_res_snapshot = gSavedSettings.getBOOL("HighResSnapshot"); + if (high_res_snapshot) gSavedSettings.setBOOL("HighResSnapshot", FALSE); + view->childSetEnabled("high_res_check", !check->get()); + checkAutoSnapshot(getPreviewView(view), TRUE); + } +} + +// static +void LLFloaterSnapshot::Impl::onClickHighResCheck(LLUICtrl *ctrl, void* data) +{ + LLCheckBoxCtrl *check = (LLCheckBoxCtrl *)ctrl; + gSavedSettings.setBOOL( "HighResSnapshot", check->get() ); + + LLFloaterSnapshot *view = (LLFloaterSnapshot *)data; + if (view) { + BOOL ui_in_snapshot = gSavedSettings.getBOOL("RenderUIInSnapshot"); + if (ui_in_snapshot) gSavedSettings.setBOOL("RenderUIInSnapshot", FALSE); + view->childSetEnabled("ui_check", !check->get()); checkAutoSnapshot(getPreviewView(view), TRUE); } } @@ -1912,6 +1937,9 @@ BOOL LLFloaterSnapshot::postBuild() childSetCommitCallback("ui_check", Impl::onClickUICheck, this); + childSetCommitCallback("high_res_check", Impl::onClickHighResCheck, this); + childSetValue("high_res_check", gSavedSettings.getBOOL("HighResSnapshot")); + childSetCommitCallback("hud_check", Impl::onClickHUDCheck, this); childSetValue("hud_check", gSavedSettings.getBOOL("RenderHUDInSnapshot")); @@ -2001,8 +2029,23 @@ void LLFloaterSnapshot::draw() childSetEnabled("send_btn", FALSE); childSetEnabled("save_btn", FALSE); } - + BOOL ui_in_snapshot = gSavedSettings.getBOOL("RenderUIInSnapshot"); + + if (previewp->getSnapshotType() != LLSnapshotLivePreview::SNAPSHOT_LOCAL) + { + childSetValue("high_res_check", FALSE); + childSetEnabled("ui_check", TRUE); + } + else + { + if (ui_in_snapshot) + { + gSavedSettings.setBOOL("HighResSnapshot", FALSE); + childSetEnabled("high_res_check", FALSE); + } + } + childSetValue("ui_check", ui_in_snapshot); childSetToolTip("ui_check", std::string("If selected shows the UI in the snapshot")); } diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 3bf390e..7c653be 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp @@ -786,12 +786,6 @@ void init_client_menu(LLMenuGL* menu) menu->appendMenu(sub_menu); menu->appendSeparator(); - - menu->append(new LLMenuItemCheckGL( "High-res Snapshot", - &menu_toggle_control, - NULL, - &menu_check_control, - (void*)"HighResSnapshot")); menu->append(new LLMenuItemCheckGL( "Quiet Snapshots to Disk", &menu_toggle_control, @@ -799,12 +793,6 @@ void init_client_menu(LLMenuGL* menu) &menu_check_control, (void*)"QuietSnapshotsToDisk")); - menu->append(new LLMenuItemCheckGL( "Compress Snapshots to Disk", - &menu_toggle_control, - NULL, - &menu_check_control, - (void*)"CompressSnapshotsToDisk")); - menu->append(new LLMenuItemCheckGL("Show Mouselook Crosshairs", &menu_toggle_control, NULL, @@ -923,12 +911,6 @@ void init_client_menu(LLMenuGL* menu) &menu_check_control, (void*)"LimitSelectDistance")); - menu->append(new LLMenuItemCheckGL("Disable Camera Constraints", - &menu_toggle_control, - NULL, - &menu_check_control, - (void*)"DisableCameraConstraints")); - menu->append(new LLMenuItemCheckGL("Mouse Smoothing", &menu_toggle_control, NULL, @@ -1379,7 +1361,7 @@ void init_debug_avatar_menu(LLMenuGL* menu) menu->append(new LLMenuItemToggleGL( "Display Agent Target", &LLAgent::sDebugDisplayTarget)); menu->append(new LLMenuItemToggleGL( "Debug Rotation", &gDebugAvatarRotation)); menu->append(new LLMenuItemCallGL("Dump Attachments", handle_dump_attachments)); - menu->append(new LLMenuItemCallGL("Rebake Textures", handle_rebake_textures, NULL, NULL, 'R', MASK_ALT | MASK_CONTROL )); + menu->append(new LLMenuItemCallGL("Refresh Appearance", handle_rebake_textures, NULL, NULL, 'R', MASK_ALT | MASK_CONTROL )); #ifndef LL_RELEASE_FOR_DOWNLOAD menu->append(new LLMenuItemCallGL("Debug Avatar Textures", handle_debug_avatar_textures, NULL, NULL, 'A', MASK_SHIFT|MASK_CONTROL|MASK_ALT)); menu->append(new LLMenuItemCallGL("Dump Local Textures", handle_dump_avatar_local_textures, NULL, NULL, 'M', MASK_SHIFT|MASK_ALT )); @@ -6259,11 +6241,6 @@ BOOL menu_ui_enabled(void *user_data) void menu_toggle_control( void* user_data ) { BOOL checked = gSavedSettings.getBOOL( static_cast(user_data) ); - if (std::string(static_cast(user_data)) == "HighResSnapshot" && !checked) - { - // High Res Snapshot active, must uncheck RenderUIInSnapshot - gSavedSettings.setBOOL( "RenderUIInSnapshot", FALSE ); - } gSavedSettings.setBOOL( static_cast(user_data), !checked ); } @@ -6275,11 +6252,6 @@ class LLToggleControl : public view_listener_t { std::string control_name = userdata.asString(); BOOL checked = gSavedSettings.getBOOL( control_name ); - if (control_name == "HighResSnapshot" && !checked) - { - // High Res Snapshot active, must uncheck RenderUIInSnapshot - gSavedSettings.setBOOL( "RenderUIInSnapshot", FALSE ); - } gSavedSettings.setBOOL( control_name, !checked ); return true; } @@ -9788,6 +9760,7 @@ void initialize_menus() addMenu(new LLEditEnableDuplicate(), "Edit.EnableDuplicate"); addMenu(new LLEditEnableTakeOff(), "Edit.EnableTakeOff"); addMenu(new LLEditEnableCustomizeAvatar(), "Edit.EnableCustomizeAvatar"); + addMenu(new LLAdvancedRebakeTextures(), "Advanced.RebakeTextures"); // View menu addMenu(new LLViewMouselook(), "View.Mouselook"); @@ -10096,7 +10069,6 @@ void initialize_menus() addMenu(new LLAdvancedToggleDebugAvatarRotation(), "Advanced.ToggleDebugAvatarRotation"); addMenu(new LLAdvancedCheckDebugAvatarRotation(), "Advanced.CheckDebugAvatarRotation"); addMenu(new LLAdvancedDumpAttachments(), "Advanced.DumpAttachments"); - addMenu(new LLAdvancedRebakeTextures(), "Advanced.RebakeTextures"); addMenu(new LLAdvancedDebugAvatarTextures(), "Advanced.DebugAvatarTextures"); addMenu(new LLAdvancedDumpAvatarLocalTextures(), "Advanced.DumpAvatarLocalTextures"); diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp index 2e77316..854d757 100644 --- a/linden/indra/newview/llviewerwindow.cpp +++ b/linden/indra/newview/llviewerwindow.cpp @@ -3812,10 +3812,6 @@ BOOL LLViewerWindow::saveImageNumbered(LLImageFormatted *image) } std::string extension("." + image->getExtension()); - if (extension.empty()) - { - extension = (gSavedSettings.getBOOL("CompressSnapshotsToDisk")) ? ".j2c" : ".bmp"; - } LLFilePicker::ESaveFilter pick_type; if (extension == ".j2c") diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml index 0c60090..c2eb3c2 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml @@ -139,6 +139,8 @@ + Capture: diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml index 682acb9..5f9d50c 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml @@ -205,6 +205,12 @@ userdata="all" /> + + + @@ -932,24 +938,13 @@ - - - - + - - - - + label="Show XUI Names" + shortcut="control|shift|x"> - - - @@ -1963,12 +1953,6 @@ userdata="LimitSelectDistance" /> - - - - + Avatar Display Options: - Joystick Options: -- cgit v1.1