activate the menu with ctrl+space

This commit is contained in:
Markus Gans 2015-12-21 18:48:38 +01:00
parent 7590d2101d
commit 33fbbd3bc6
7 changed files with 21 additions and 13 deletions

View File

@ -1,3 +1,10 @@
2015-12-20 Markus Gans <guru.mail@muenster.de>
* Add the possibility to switch off the cursor optimization
for bad ANSI-terminal implementations like HyperTerminal
(e.g. horizontal absolute position (ch) has there no function)
* Now you can activate the menu with ctrl+space, too.
(For terminals with no meta key support)
2015-12-20 Markus Gans <guru.mail@muenster.de> 2015-12-20 Markus Gans <guru.mail@muenster.de>
* Bug fix in FTerm updateVTerm() for updates from vdesktop * Bug fix in FTerm updateVTerm() for updates from vdesktop
* Add raiseWindow() to FMenuBar::leaveMenuBar() * Add raiseWindow() to FMenuBar::leaveMenuBar()

View File

@ -296,7 +296,7 @@ void FButtonGroup::hide()
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
void FButtonGroup::insert(FToggleButton* button) void FButtonGroup::insert (FToggleButton* button)
{ {
if ( button->group() ) if ( button->group() )
button->group()->remove(button); button->group()->remove(button);
@ -316,7 +316,7 @@ void FButtonGroup::insert(FToggleButton* button)
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
void FButtonGroup::remove(FToggleButton* button) void FButtonGroup::remove (FToggleButton* button)
{ {
FButtonGroup::FButtonList::iterator iter; FButtonGroup::FButtonList::iterator iter;

View File

@ -174,7 +174,6 @@ class fc
// keyboard - single keys // keyboard - single keys
enum keys enum keys
{ {
Fckey_at = 0x0000000, // control-@
Fckey_a = 0x0000001, // control-a Fckey_a = 0x0000001, // control-a
Fckey_b = 0x0000002, // control-b Fckey_b = 0x0000002, // control-b
Fckey_c = 0x0000003, // control-c Fckey_c = 0x0000003, // control-c
@ -207,6 +206,7 @@ class fc
Fckey_caret = 0x000001e, // control-^ Fckey_caret = 0x000001e, // control-^
Fckey_underscore = 0x000001f, // control-_ Fckey_underscore = 0x000001f, // control-_
Fkey_space = 0x0000020, Fkey_space = 0x0000020,
Fckey_space = 0x1000020, // control-space
Fkey_backspace = 0x1000100, Fkey_backspace = 0x1000100,
Fkey_catab = 0x1000101, Fkey_catab = 0x1000101,
Fkey_clear = 0x1000102, Fkey_clear = 0x1000102,

View File

@ -415,7 +415,6 @@ keyname;
static keyname FkeyName[] = static keyname FkeyName[] =
{ {
{ fc::Fckey_at , "Ctrl+@" },
{ fc::Fckey_a , "Ctrl+A" }, { fc::Fckey_a , "Ctrl+A" },
{ fc::Fckey_b , "Ctrl+B" }, { fc::Fckey_b , "Ctrl+B" },
{ fc::Fckey_c , "Ctrl+C" }, { fc::Fckey_c , "Ctrl+C" },
@ -447,6 +446,7 @@ static keyname FkeyName[] =
{ fc::Fckey_caret , "Ctrl+^" }, { fc::Fckey_caret , "Ctrl+^" },
{ fc::Fckey_underscore , "Ctrl+_" }, { fc::Fckey_underscore , "Ctrl+_" },
{ fc::Fkey_space , "Space" }, { fc::Fkey_space , "Space" },
{ fc::Fckey_space , "Ctrl+Space" }, // Ctrl+(Space or @)
{ fc::Fkey_backspace , "Backspace" }, { fc::Fkey_backspace , "Backspace" },
{ fc::Fkey_catab , "Clear-All-Tabs" }, { fc::Fkey_catab , "Clear-All-Tabs" },
{ fc::Fkey_clear , "Clear-Screen" }, { fc::Fkey_clear , "Clear-Screen" },

View File

@ -48,6 +48,7 @@ void FMenuBar::init()
getRootWidget()->setTopPadding(1, true); getRootWidget()->setTopPadding(1, true);
setMenuBar(this); setMenuBar(this);
addAccelerator (fc::Fkey_f10); addAccelerator (fc::Fkey_f10);
addAccelerator (fc::Fckey_space);
foregroundColor = wc.menu_active_fg; foregroundColor = wc.menu_active_fg;
backgroundColor = wc.menu_active_bg; backgroundColor = wc.menu_active_bg;
window_object = true; window_object = true;

View File

@ -33,7 +33,7 @@ FToggleButton::FToggleButton(FWidget* parent)
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
FToggleButton::FToggleButton ( const FString& txt, FWidget* parent ) FToggleButton::FToggleButton (const FString& txt, FWidget* parent)
: FWidget(parent) : FWidget(parent)
, focus_inside_group(true) , focus_inside_group(true)
, text() , text()
@ -374,7 +374,7 @@ void FToggleButton::setGeometry (int x, int y, int w, int h, bool adjust)
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
bool FToggleButton::setNoUnderline(bool on) bool FToggleButton::setNoUnderline (bool on)
{ {
if ( on ) if ( on )
flags |= NO_UNDERLINE; flags |= NO_UNDERLINE;
@ -384,7 +384,7 @@ bool FToggleButton::setNoUnderline(bool on)
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
bool FToggleButton::setEnable(bool on) bool FToggleButton::setEnable (bool on)
{ {
FWidget::setEnable(on); FWidget::setEnable(on);
@ -414,7 +414,7 @@ bool FToggleButton::setEnable(bool on)
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
bool FToggleButton::setFocus(bool on) bool FToggleButton::setFocus (bool on)
{ {
FWidget::setFocus(on); FWidget::setFocus(on);
@ -608,7 +608,7 @@ void FToggleButton::onFocusOut (FFocusEvent* out_ev)
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
bool FToggleButton::setChecked(bool on) bool FToggleButton::setChecked (bool on)
{ {
if ( checked != on ) if ( checked != on )
{ {

View File

@ -84,18 +84,18 @@ class FToggleButton : public FWidget
void onFocusIn (FFocusEvent*); void onFocusIn (FFocusEvent*);
void onFocusOut (FFocusEvent*); void onFocusOut (FFocusEvent*);
bool setNoUnderline(bool); bool setNoUnderline (bool);
bool setNoUnderline(); bool setNoUnderline();
bool unsetNoUnderline(); bool unsetNoUnderline();
bool setEnable(bool); bool setEnable (bool);
bool setEnable(); bool setEnable();
bool unsetEnable(); bool unsetEnable();
bool setDisable(); bool setDisable();
bool setFocus(bool); bool setFocus (bool);
bool setFocus(); bool setFocus();
bool unsetFocus(); bool unsetFocus();
bool setChecked(bool); bool setChecked (bool);
bool setChecked(); bool setChecked();
bool unsetChecked(); bool unsetChecked();
bool isChecked(); bool isChecked();