Kaydet (Commit) 251737f0 authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: fdo#88417 Dropdown for ruler settings should show radio buttons

This reverts commit 9995222d
and additionally converts the ruler settings to radio buttons and not
checkboxes

Conflicts:
	vcl/source/control/tabctrl.cxx

Change-Id: Ie0eac5f07729447942065b7f415398165fbf067c
üst 35b77d0c
...@@ -26,67 +26,67 @@ Menu RID_SVXMN_RULER ...@@ -26,67 +26,67 @@ Menu RID_SVXMN_RULER
MenuItem MenuItem
{ {
Identifier = ID_MM ; Identifier = ID_MM ;
Checkable = TRUE ; RadioCheck = TRUE ;
Text [ en-US ] = "Millimeter" ; Text [ en-US ] = "Millimeter" ;
}; };
MenuItem MenuItem
{ {
Identifier = ID_CM ; Identifier = ID_CM ;
Checkable = TRUE ; RadioCheck = TRUE ;
Text [ en-US ] = "Centimeter" ; Text [ en-US ] = "Centimeter" ;
}; };
MenuItem MenuItem
{ {
Identifier = ID_M ; Identifier = ID_M ;
Checkable = TRUE ; RadioCheck = TRUE ;
Text [ en-US ] = "Meter" ; Text [ en-US ] = "Meter" ;
}; };
MenuItem MenuItem
{ {
Identifier = ID_KM ; Identifier = ID_KM ;
Checkable = TRUE ; RadioCheck = TRUE ;
Text [ en-US ] = "Kilometer" ; Text [ en-US ] = "Kilometer" ;
}; };
MenuItem MenuItem
{ {
Identifier = ID_INCH ; Identifier = ID_INCH ;
Checkable = TRUE ; RadioCheck = TRUE ;
Text [ en-US ] = "Inch" ; Text [ en-US ] = "Inch" ;
}; };
MenuItem MenuItem
{ {
Identifier = ID_FOOT ; Identifier = ID_FOOT ;
Checkable = TRUE ; RadioCheck = TRUE ;
Text [ en-US ] = "Foot" ; Text [ en-US ] = "Foot" ;
}; };
MenuItem MenuItem
{ {
Identifier = ID_MILE ; Identifier = ID_MILE ;
Checkable = TRUE ; RadioCheck = TRUE ;
Text [ en-US ] = "Miles" ; Text [ en-US ] = "Miles" ;
}; };
MenuItem MenuItem
{ {
Identifier = ID_POINT ; Identifier = ID_POINT ;
Checkable = TRUE ; RadioCheck = TRUE ;
Text [ en-US ] = "Point" ; Text [ en-US ] = "Point" ;
}; };
MenuItem MenuItem
{ {
Identifier = ID_PICA ; Identifier = ID_PICA ;
Checkable = TRUE ; RadioCheck = TRUE ;
Text [ en-US ] = "Pica" ; Text [ en-US ] = "Pica" ;
}; };
MenuItem MenuItem
{ {
Identifier = ID_CHAR ; Identifier = ID_CHAR ;
Checkable = TRUE ; RadioCheck = TRUE ;
Text[ en-US ] = "Char" ; Text[ en-US ] = "Char" ;
}; };
MenuItem MenuItem
{ {
Identifier = ID_LINE ; Identifier = ID_LINE ;
Checkable = TRUE ; RadioCheck = TRUE ;
Text[ en-US ] = "Line" ; Text[ en-US ] = "Line" ;
}; };
}; };
......
...@@ -1448,7 +1448,7 @@ void TabControl::Command( const CommandEvent& rCEvt ) ...@@ -1448,7 +1448,7 @@ void TabControl::Command( const CommandEvent& rCEvt )
for( std::vector< ImplTabItem >::iterator it = mpTabCtrlData->maItemList.begin(); for( std::vector< ImplTabItem >::iterator it = mpTabCtrlData->maItemList.begin();
it != mpTabCtrlData->maItemList.end(); ++it ) it != mpTabCtrlData->maItemList.end(); ++it )
{ {
aMenu.InsertItem( it->mnId, it->maText, MenuItemBits::CHECKABLE ); aMenu.InsertItem( it->mnId, it->maText, MenuItemBits::CHECKABLE | MenuItemBits::RADIOCHECK );
if ( it->mnId == mnCurPageId ) if ( it->mnId == mnCurPageId )
aMenu.CheckItem( it->mnId ); aMenu.CheckItem( it->mnId );
aMenu.SetHelpId( it->mnId, it->maHelpId ); aMenu.SetHelpId( it->mnId, it->maHelpId );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment