summaryrefslogtreecommitdiff
path: root/src/Screen.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Screen.cc')
-rw-r--r--src/Screen.cc13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 01b6d79..e139f74 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -192,7 +192,6 @@ setFromString(const char *strval) {
192 m_value = FbWinFrame::TOPRIGHT; 192 m_value = FbWinFrame::TOPRIGHT;
193 else if (strcasecmp(strval, "BottomRight")==0) 193 else if (strcasecmp(strval, "BottomRight")==0)
194 m_value = FbWinFrame::BOTTOMRIGHT; 194 m_value = FbWinFrame::BOTTOMRIGHT;
195 /*
196 else if (strcasecmp(strval, "LeftTop") == 0) 195 else if (strcasecmp(strval, "LeftTop") == 0)
197 m_value = FbWinFrame::LEFTTOP; 196 m_value = FbWinFrame::LEFTTOP;
198 else if (strcasecmp(strval, "LeftBottom") == 0) 197 else if (strcasecmp(strval, "LeftBottom") == 0)
@@ -201,7 +200,6 @@ setFromString(const char *strval) {
201 m_value = FbWinFrame::RIGHTTOP; 200 m_value = FbWinFrame::RIGHTTOP;
202 else if (strcasecmp(strval, "RightBottom") == 0) 201 else if (strcasecmp(strval, "RightBottom") == 0)
203 m_value = FbWinFrame::RIGHTBOTTOM; 202 m_value = FbWinFrame::RIGHTBOTTOM;
204 */
205 else 203 else
206 setDefaultValue(); 204 setDefaultValue();
207} 205}
@@ -222,7 +220,6 @@ getString() const {
222 case FbWinFrame::BOTTOMRIGHT: 220 case FbWinFrame::BOTTOMRIGHT:
223 return string("BottomRight"); 221 return string("BottomRight");
224 break; 222 break;
225/*
226 case FbWinFrame::LEFTTOP: 223 case FbWinFrame::LEFTTOP:
227 return string("LeftTop"); 224 return string("LeftTop");
228 break; 225 break;
@@ -235,7 +232,6 @@ getString() const {
235 case FbWinFrame::RIGHTBOTTOM: 232 case FbWinFrame::RIGHTBOTTOM:
236 return string("RightBottom"); 233 return string("RightBottom");
237 break; 234 break;
238*/
239 } 235 }
240 //default string 236 //default string
241 return string("TopLeft"); 237 return string("TopLeft");
@@ -1659,16 +1655,13 @@ void BScreen::setupConfigmenu(FbTk::Menu &menu) {
1659 1655
1660 // menu is 2 wide, 2 down 1656 // menu is 2 wide, 2 down
1661 place_menu.push_back(PlacementP(_FBTEXT(Align, TopLeft, "Top Left", "Top Left"), FbWinFrame::TOPLEFT)); 1657 place_menu.push_back(PlacementP(_FBTEXT(Align, TopLeft, "Top Left", "Top Left"), FbWinFrame::TOPLEFT));
1662 place_menu.push_back(PlacementP(_FBTEXT(Align, BottomLeft, "Bottom Left", "Bottom Left"), FbWinFrame::BOTTOMLEFT));
1663 place_menu.push_back(PlacementP(_FBTEXT(Align, TopRight, "Top Right", "Top Right"), FbWinFrame::TOPRIGHT));
1664 place_menu.push_back(PlacementP(_FBTEXT(Align, BottomRight, "Bottom Right", "Bottom Right"), FbWinFrame::BOTTOMRIGHT));
1665
1666/*
1667 place_menu.push_back(PlacementP(_FBTEXT(Align, LeftTop, "Left Top", "Left Top"), FbWinFrame::LEFTTOP)); 1658 place_menu.push_back(PlacementP(_FBTEXT(Align, LeftTop, "Left Top", "Left Top"), FbWinFrame::LEFTTOP));
1668 place_menu.push_back(PlacementP(_FBTEXT(Align, LeftBottom, "Left Bottom", "Left Bottom"), FbWinFrame::LEFTBOTTOM)); 1659 place_menu.push_back(PlacementP(_FBTEXT(Align, LeftBottom, "Left Bottom", "Left Bottom"), FbWinFrame::LEFTBOTTOM));
1660 place_menu.push_back(PlacementP(_FBTEXT(Align, BottomLeft, "Bottom Left", "Bottom Left"), FbWinFrame::BOTTOMLEFT));
1661 place_menu.push_back(PlacementP(_FBTEXT(Align, TopRight, "Top Right", "Top Right"), FbWinFrame::TOPRIGHT));
1669 place_menu.push_back(PlacementP(_FBTEXT(Align, RightTop, "Right Top", "Right Top"), FbWinFrame::RIGHTTOP)); 1662 place_menu.push_back(PlacementP(_FBTEXT(Align, RightTop, "Right Top", "Right Top"), FbWinFrame::RIGHTTOP));
1670 place_menu.push_back(PlacementP(_FBTEXT(Align, RightBottom, "Right Bottom", "Right Bottom"), FbWinFrame::RIGHTBOTTOM)); 1663 place_menu.push_back(PlacementP(_FBTEXT(Align, RightBottom, "Right Bottom", "Right Bottom"), FbWinFrame::RIGHTBOTTOM));
1671*/ 1664 place_menu.push_back(PlacementP(_FBTEXT(Align, BottomRight, "Bottom Right", "Bottom Right"), FbWinFrame::BOTTOMRIGHT));
1672 1665
1673 tabplacement_menu->setMinimumSublevels(2); 1666 tabplacement_menu->setMinimumSublevels(2);
1674 // create items in sub menu 1667 // create items in sub menu