Revision: 4927
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4927&view=rev
Author: ossman_
Date: 2012-07-05 09:23:03 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
Move the fullscreen option to a separate tab, in preparation for more
screen related options.
Modified Paths:
--------------
trunk/vncviewer/OptionsDialog.cxx
trunk/vncviewer/OptionsDialog.h
Modified: trunk/vncviewer/OptionsDialog.cxx
===================================================================
--- trunk/vncviewer/OptionsDialog.cxx 2012-07-04 11:37:48 UTC (rev 4926)
+++ trunk/vncviewer/OptionsDialog.cxx 2012-07-05 09:23:03 UTC (rev 4927)
@@ -67,6 +67,7 @@
createCompressionPage(tx, ty, tw, th);
createSecurityPage(tx, ty, tw, th);
createInputPage(tx, ty, tw, th);
+ createScreenPage(tx, ty, tw, th);
createMiscPage(tx, ty, tw, th);
}
@@ -269,9 +270,11 @@
if (!strcmp(getMenuKeySymbols()[i].name, menuKeyBuf))
menuKeyChoice->value(i + 1);
+ /* Screen */
+ fullScreenCheckbox->value(fullScreen);
+
/* Misc. */
sharedCheckbox->value(shared);
- fullScreenCheckbox->value(fullScreen);
dotCursorCheckbox->value(dotWhenNoCursor);
}
@@ -356,9 +359,11 @@
menuKey.setParam(menuKeyChoice->text());
}
+ /* Screen */
+ fullScreen.setParam(fullScreenCheckbox->value());
+
/* Misc. */
shared.setParam(sharedCheckbox->value());
- fullScreen.setParam(fullScreenCheckbox->value());
dotWhenNoCursor.setParam(dotCursorCheckbox->value());
std::map<OptionsCallback*, void*>::const_iterator iter;
@@ -686,6 +691,23 @@
}
+void OptionsDialog::createScreenPage(int tx, int ty, int tw, int th)
+{
+ Fl_Group *group = new Fl_Group(tx, ty, tw, th, _("Screen"));
+
+ tx += OUTER_MARGIN;
+ ty += OUTER_MARGIN;
+
+ fullScreenCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
+ CHECK_MIN_WIDTH,
+ CHECK_HEIGHT,
+ _("Full-screen mode")));
+ ty += CHECK_HEIGHT + TIGHT_MARGIN;
+
+ group->end();
+}
+
+
void OptionsDialog::createMiscPage(int tx, int ty, int tw, int th)
{
Fl_Group *group = new Fl_Group(tx, ty, tw, th, _("Misc."));
@@ -699,12 +721,6 @@
_("Shared (don't disconnect
other viewers)")));
ty += CHECK_HEIGHT + TIGHT_MARGIN;
- fullScreenCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
- CHECK_MIN_WIDTH,
- CHECK_HEIGHT,
- _("Full-screen mode")));
- ty += CHECK_HEIGHT + TIGHT_MARGIN;
-
dotCursorCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty,
CHECK_MIN_WIDTH,
CHECK_HEIGHT,
Modified: trunk/vncviewer/OptionsDialog.h
===================================================================
--- trunk/vncviewer/OptionsDialog.h 2012-07-04 11:37:48 UTC (rev 4926)
+++ trunk/vncviewer/OptionsDialog.h 2012-07-05 09:23:03 UTC (rev 4927)
@@ -50,6 +50,7 @@
void createCompressionPage(int tx, int ty, int tw, int th);
void createSecurityPage(int tx, int ty, int tw, int th);
void createInputPage(int tx, int ty, int tw, int th);
+ void createScreenPage(int tx, int ty, int tw, int th);
void createMiscPage(int tx, int ty, int tw, int th);
static void handleAutoselect(Fl_Widget *widget, void *data);
@@ -105,9 +106,11 @@
Fl_Check_Button *systemKeysCheckbox;
Fl_Choice *menuKeyChoice;
+ /* Screen */
+ Fl_Check_Button *fullScreenCheckbox;
+
/* Misc. */
Fl_Check_Button *sharedCheckbox;
- Fl_Check_Button *fullScreenCheckbox;
Fl_Check_Button *dotCursorCheckbox;
};
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
