[Libreoffice-commits] core.git: 2 commits - dbaccess/inc dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk vcl/inc vcl/osx vcl/quartz
Caolán McNamara
caolanm at redhat.com
Fri Jan 24 03:06:12 PST 2014
dbaccess/UIConfig_dbaccess.mk | 1
dbaccess/inc/dbaccess_helpid.hrc | 5
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 87 +++-------
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 16 -
dbaccess/source/ui/dlg/dbadminsetup.hrc | 4
dbaccess/source/ui/dlg/dbadminsetup.src | 75 --------
dbaccess/source/ui/inc/dbu_resource.hrc | 1
dbaccess/uiconfig/ui/finalpagewizard.ui | 189 ++++++++++++++++++++++
dbaccess/uiconfig/ui/generalpagewizard.ui | 7
vcl/inc/osx/salframeview.h | 5
vcl/osx/DropTarget.cxx | 22 --
vcl/osx/a11ywrapperrow.mm | 3
vcl/osx/salframe.cxx | 12 -
vcl/osx/salmenu.cxx | 10 -
vcl/osx/vclnsapp.mm | 14 -
vcl/quartz/salgdiutils.cxx | 2
16 files changed, 245 insertions(+), 208 deletions(-)
New commits:
commit 800857bcbb57bca59818660e2c8cfad12ad2243a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 24 10:51:23 2014 +0000
convert dbwizard final page to .ui
Change-Id: Ib31810170574e46b84a9847b25585fee791d630d
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index a493107..bb77efa 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/colwidthdialog \
dbaccess/uiconfig/ui/directsqldialog \
dbaccess/uiconfig/ui/fielddialog \
+ dbaccess/uiconfig/ui/finalpagewizard \
dbaccess/uiconfig/ui/generalpagedialog \
dbaccess/uiconfig/ui/generalpagewizard \
dbaccess/uiconfig/ui/querypropertiesdialog \
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index e1b407f..b8d3523 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -394,11 +394,6 @@
#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME "DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME"
#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_PB_TESTCONNECTION "DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_PB_TESTCONNECTION"
-#define HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE "DBACCESS_HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE"
-#define HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE "DBACCESS_HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE"
-#define HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD "DBACCESS_HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD"
-#define HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS "DBACCESS_HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS"
-
#define HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE "DBACCESS_HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE"
#define HID_PAGE_DBWIZARD_USERDEFINED_BROWSE "DBACCESS_HID_PAGE_DBWIZARD_USERDEFINED_BROWSE"
#define HID_INDEX_DIALOG_ACTION_TB "DBACCESS_HID_INDEX_DIALOG_ACTION_TB"
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index a911493..82c0194 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -752,51 +752,22 @@ using namespace ::com::sun::star;
}
- OFinalDBPageSetup::OFinalDBPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs )
- :OGenericAdministrationPage(pParent, ModuleRes(PAGE_DBWIZARD_FINAL), _rCoreAttrs )
- , m_aFTFinalHeader (this, ModuleRes(FT_FINALHEADER))
- , m_aFTFinalHelpText (this, ModuleRes(FT_FINALHELPTEXT))
- , m_aRBRegisterDataSource (this, ModuleRes(RB_REGISTERDATASOURCE))
- , m_aRBDontregisterDataSource (this, ModuleRes(RB_DONTREGISTERDATASOURCE))
- , m_aFTAdditionalSettings (this, ModuleRes(FT_ADDITIONALSETTINGS))
- , m_aCBOpenAfterwards (this, ModuleRes(CB_OPENAFTERWARDS))
- , m_aCBStartTableWizard (this, ModuleRes(CB_STARTTABLEWIZARD))
- , m_aFTFinalText (this, ModuleRes(FT_FINALTEXT))
- {
-
- SetControlFontWeight(&m_aFTFinalHeader);
- m_aCBOpenAfterwards.SetClickHdl(LINK(this, OFinalDBPageSetup, OnOpenSelected));
- m_aCBStartTableWizard.SetClickHdl(getControlModifiedLink());
- m_aRBRegisterDataSource.SetState(sal_True);
- FreeResource();
+ OFinalDBPageSetup::OFinalDBPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs)
+ : OGenericAdministrationPage(pParent, "PageFinal",
+ "dbaccess/ui/finalpagewizard.ui", _rCoreAttrs)
+ {
+ get(m_pFTFinalHeader, "headerText");
+ get(m_pFTFinalHelpText, "helpText");
+ get(m_pRBRegisterDataSource, "yesregister");
+ get(m_pRBDontregisterDataSource, "noregister");
+ get(m_pFTAdditionalSettings, "additionalText");
+ get(m_pCBOpenAfterwards, "openediting");
+ get(m_pCBStartTableWizard, "usewizard");
+ get(m_pFTFinalText, "finishText");
- sal_Int32 nUnrelatedHeight = LogicToPixel( Size( 0, UNRELATED_CONTROLS ), MAP_APPFONT ).Height();
- sal_Int32 nRelatedHeight = LogicToPixel( Size( 0, RELATED_CONTROLS ), MAP_APPFONT ).Height();
-
- ::std::pair<Window*,sal_Int32> pWindows[] = {
- ::std::pair<Window*,sal_Int32>(&m_aFTFinalHelpText,nRelatedHeight)
- ,::std::pair<Window*,sal_Int32>(&m_aRBRegisterDataSource,nRelatedHeight)
- ,::std::pair<Window*,sal_Int32>(&m_aRBDontregisterDataSource,nUnrelatedHeight)
- ,::std::pair<Window*,sal_Int32>(&m_aFTAdditionalSettings,nRelatedHeight)
- ,::std::pair<Window*,sal_Int32>(&m_aCBOpenAfterwards,nRelatedHeight)
- ,::std::pair<Window*,sal_Int32>(&m_aCBStartTableWizard,nUnrelatedHeight)
- ,::std::pair<Window*,sal_Int32>(&m_aFTFinalText,nUnrelatedHeight)
- };
-
- Point aPos(m_aFTFinalHeader.GetPosPixel());
- Size aStart(m_aFTFinalHeader.GetSizePixel());
- aPos.Y() += aStart.Height() + nUnrelatedHeight;
- sal_Int32 nCount = sizeof(pWindows) / sizeof(pWindows[0]);
- for (sal_Int32 i=0; i < nCount; ++i)
- {
- aPos.X() = pWindows[i].first->GetPosPixel().X();
- Size aSize = pWindows[i].first->GetSizePixel();
- FixedText* pText = dynamic_cast<FixedText*>(pWindows[i].first);
- if ( pText )
- aSize = pText->CalcMinimumSize(aSize.Width());
- pWindows[i].first->SetPosSizePixel(aPos,aSize);
- aPos.Y() += aSize.Height() + pWindows[i].second;
- }
+ m_pCBOpenAfterwards->SetClickHdl(LINK(this, OFinalDBPageSetup, OnOpenSelected));
+ m_pCBStartTableWizard->SetClickHdl(getControlModifiedLink());
+ m_pRBRegisterDataSource->SetState(sal_True);
}
OFinalDBPageSetup::~OFinalDBPageSetup()
@@ -806,43 +777,43 @@ using namespace ::com::sun::star;
sal_Bool OFinalDBPageSetup::IsDatabaseDocumentToBeRegistered()
{
- return m_aRBRegisterDataSource.IsChecked() && m_aRBRegisterDataSource.IsEnabled();
+ return m_pRBRegisterDataSource->IsChecked() && m_pRBRegisterDataSource->IsEnabled();
}
sal_Bool OFinalDBPageSetup::IsDatabaseDocumentToBeOpened()
{
- return m_aCBOpenAfterwards.IsChecked() && m_aCBOpenAfterwards.IsEnabled();
+ return m_pCBOpenAfterwards->IsChecked() && m_pCBOpenAfterwards->IsEnabled();
}
sal_Bool OFinalDBPageSetup::IsTableWizardToBeStarted()
{
- return m_aCBStartTableWizard.IsChecked() && m_aCBStartTableWizard.IsEnabled();
+ return m_pCBStartTableWizard->IsChecked() && m_pCBStartTableWizard->IsEnabled();
}
void OFinalDBPageSetup::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList)
{
- _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTFinalHeader));
- _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTFinalHelpText));
- _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTAdditionalSettings));
- _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTFinalText));
+ _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTFinalHeader));
+ _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTFinalHelpText));
+ _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTAdditionalSettings));
+ _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTFinalText));
}
void OFinalDBPageSetup::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList)
{
- _rControlList.push_back(new OSaveValueWrapper<CheckBox>(&m_aCBOpenAfterwards));
- _rControlList.push_back(new OSaveValueWrapper<CheckBox>(&m_aCBStartTableWizard));
- _rControlList.push_back(new OSaveValueWrapper<RadioButton>(&m_aRBRegisterDataSource));
- _rControlList.push_back(new OSaveValueWrapper<RadioButton>(&m_aRBDontregisterDataSource));
+ _rControlList.push_back(new OSaveValueWrapper<CheckBox>(m_pCBOpenAfterwards));
+ _rControlList.push_back(new OSaveValueWrapper<CheckBox>(m_pCBStartTableWizard));
+ _rControlList.push_back(new OSaveValueWrapper<RadioButton>(m_pRBRegisterDataSource));
+ _rControlList.push_back(new OSaveValueWrapper<RadioButton>(m_pRBDontregisterDataSource));
}
void OFinalDBPageSetup::implInitControls(const SfxItemSet& /*_rSet*/, sal_Bool /*_bSaveValue*/)
{
- m_aCBOpenAfterwards.Check();
+ m_pCBOpenAfterwards->Check();
}
void OFinalDBPageSetup::enableTableWizardCheckBox( sal_Bool _bSupportsTableCreation)
{
- m_aCBStartTableWizard.Enable(_bSupportsTableCreation);
+ m_pCBStartTableWizard->Enable(_bSupportsTableCreation);
}
sal_Bool OFinalDBPageSetup::FillItemSet( SfxItemSet& /*_rSet*/ )
@@ -851,7 +822,7 @@ using namespace ::com::sun::star;
}
IMPL_LINK(OFinalDBPageSetup, OnOpenSelected, CheckBox*, _pBox)
{
- m_aCBStartTableWizard.Enable( _pBox->IsEnabled() && _pBox->IsChecked() );
+ m_pCBStartTableWizard->Enable( _pBox->IsEnabled() && _pBox->IsChecked() );
callModifiedHdl();
// outta here
return 0L;
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index aa6f58f..f2e8502 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -262,14 +262,14 @@ namespace dbaui
virtual sal_Bool FillItemSet ( SfxItemSet& _rCoreAttrs );
static OGenericAdministrationPage* CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet);
- FixedText m_aFTFinalHeader;
- FixedText m_aFTFinalHelpText;
- RadioButton m_aRBRegisterDataSource;
- RadioButton m_aRBDontregisterDataSource;
- FixedText m_aFTAdditionalSettings;
- CheckBox m_aCBOpenAfterwards;
- CheckBox m_aCBStartTableWizard;
- FixedText m_aFTFinalText;
+ FixedText* m_pFTFinalHeader;
+ FixedText* m_pFTFinalHelpText;
+ RadioButton* m_pRBRegisterDataSource;
+ RadioButton* m_pRBDontregisterDataSource;
+ FixedText* m_pFTAdditionalSettings;
+ CheckBox* m_pCBOpenAfterwards;
+ CheckBox* m_pCBStartTableWizard;
+ FixedText* m_pFTFinalText;
OFinalDBPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs);
sal_Bool IsDatabaseDocumentToBeRegistered();
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.hrc b/dbaccess/source/ui/dlg/dbadminsetup.hrc
index 7d5af5e..0415460 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.hrc
+++ b/dbaccess/source/ui/dlg/dbadminsetup.hrc
@@ -83,10 +83,6 @@
#define FT_AUTHENTIFICATIONHEADERTEXT 8
#define FT_LDAP_HEADERTEXT 9
#define FT_GENERALUSERNAME 10
-#define FT_FINALHEADER 11
-#define FT_FINALTEXT 12
-#define FT_FINALHELPTEXT 13
-#define FT_ADDITIONALSETTINGS 14
#define FT_SETUP_WIZARD_HEADER 15
#define FT_SETUP_WIZARD_HELP 16
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src
index 9680a08..b5de1bb 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -241,81 +241,6 @@ TabPage PAGE_DBWIZARD_AUTHENTIFICATION
};
};
-
-TabPage PAGE_DBWIZARD_FINAL
-{
- HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_FINAL";
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
- Hide = TRUE ;
-
- FixedText FT_FINALHEADER
- {
- Pos = MAP_APPFONT ( START_X , 8 ) ;
- Size = MAP_APPFONT ( WIZARD_PAGE_X - START_X - 6 , 2* FIXEDTEXT_HEIGHT ) ;
- Text[ en-US ] = "Decide how to proceed after saving the database";
- WordBreak = TRUE;
- };
-
- FixedText FT_FINALHELPTEXT
- {
- Pos = MAP_APPFONT (START_X , 27 ) ;
- Size = MAP_APPFONT ( WIZARD_PAGE_X - START_X - 6, 2*FIXEDTEXT_HEIGHT ) ;
- Text[ en-US ] = "Do you want the wizard to register the database in %PRODUCTNAME?" ;
- WordBreak = TRUE ;
- };
-
- RadioButton RB_REGISTERDATASOURCE
- {
- HelpId = HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE;
- Pos = MAP_APPFONT (START_X + 6 , 45 ) ;
- Size = MAP_APPFONT ( 205 , 9 ) ;
- Group = TRUE;
- Text[ en-US ] = "~Yes, register the database for me" ;
- };
-
- RadioButton RB_DONTREGISTERDATASOURCE
- {
- HelpId = HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE ;
- Pos = MAP_APPFONT (START_X + 6, 57 ) ;
- Size = MAP_APPFONT ( 208 , 8 ) ;
- Text[ en-US ] = "N~o, do not register the database" ;
- };
-
- FixedText FT_ADDITIONALSETTINGS
- {
- Pos = MAP_APPFONT (START_X , 100 ) ;
- Size = MAP_APPFONT ( WIZARD_PAGE_X - START_X - 6 , 8 ) ;
- Text[ en-US ] = "After the database file has been saved, what do you want to do?" ;
- };
-
- CheckBox CB_OPENAFTERWARDS
- {
- HelpId = HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS ;
- Pos = MAP_APPFONT (START_X + 6, 118 ) ;
- Size = MAP_APPFONT ( WIZARD_PAGE_X - START_X , 8 ) ;
- Text[ en-US ] = "Open the database for editing" ;
- };
-
- CheckBox CB_STARTTABLEWIZARD
- {
- HelpId = HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD ;
- Pos = MAP_APPFONT (START_X + 6, 130 ) ;
- Size = MAP_APPFONT ( WIZARD_PAGE_X - START_X - 12 , 8 ) ;
- Text[ en-US ] = "Create tables using the table wizard" ;
- };
-
-
- FixedText FT_FINALTEXT
- {
- Pos = MAP_APPFONT ( START_X , 173 ) ;
- Size = MAP_APPFONT ( WIZARD_PAGE_X - START_X - 6 , 2* FIXEDTEXT_HEIGHT ) ;
- Text[ en-US ] = "Click 'Finish' to save the database.";
- WordBreak = TRUE;
- };
-};
-
TabPage PAGE_DBWIZARD_MYSQL_JDBC
{
HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MYSQL_JDBC";
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index bbe093e..f7ac4f2 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -138,7 +138,6 @@
#define PAGE_DBWIZARD_SPREADSHEET RID_PAGE_START + 52
#define PAGE_DBWIZARD_AUTHENTIFICATION RID_PAGE_START + 53
#define PAGE_DBWIZARD_MYSQL_JDBC RID_PAGE_START + 54
-#define PAGE_DBWIZARD_FINAL RID_PAGE_START + 55
#define PAGE_DBWIZARD_USERDEFINED RID_PAGE_START + 56
#define PAGE_DBWIZARD_MYSQL_NATIVE RID_PAGE_START + 57
diff --git a/dbaccess/uiconfig/ui/finalpagewizard.ui b/dbaccess/uiconfig/ui/finalpagewizard.ui
new file mode 100644
index 0000000..4382e6e
--- /dev/null
+++ b/dbaccess/uiconfig/ui/finalpagewizard.ui
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Fri Jan 24 10:58:39 2014 -->
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkBox" id="PageFinal">
+ <property name="width_request">400</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">8</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="headerText">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Decide how to proceed after saving the database</property>
+ <property name="wrap">True</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">24</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="helpText">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Do you want the wizard to register the database in %PRODUCTNAME?</property>
+ <property name="wrap">True</property>
+ <property name="wrap_mode">word-char</property>
+ <property name="max_width_chars">72</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="yesregister">
+ <property name="label" translatable="yes">_Yes, register the database for me</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_left">12</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">noregister</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="noregister">
+ <property name="label" translatable="yes">N_o, do not register the database</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_left">12</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">yesregister</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="additionalText">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">After the database file has been saved, what do you want to do?</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">72</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="openediting">
+ <property name="label" translatable="yes">Open the database for editing</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_left">12</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="usewizard">
+ <property name="label" translatable="yes">Create tables using the table wizard</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_left">12</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="finishText">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Click 'Finish' to save the database.</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+</interface>
diff --git a/dbaccess/uiconfig/ui/generalpagewizard.ui b/dbaccess/uiconfig/ui/generalpagewizard.ui
index b1f9dd4..bd1fc0b 100644
--- a/dbaccess/uiconfig/ui/generalpagewizard.ui
+++ b/dbaccess/uiconfig/ui/generalpagewizard.ui
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Fri Jan 24 10:59:11 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
@@ -28,12 +29,12 @@
</child>
<child>
<object class="GtkLabel" id="helpText">
- <property name="height_request">50</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Use the Database Wizard to create a new database, open an existing database file, or connect to a database stored on a server.</property>
<property name="wrap">True</property>
+ <property name="max_width_chars">72</property>
</object>
<packing>
<property name="expand">False</property>
@@ -99,8 +100,6 @@
<object class="GtkComboBoxText" id="embeddeddbList">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -217,8 +216,6 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="margin_left">48</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
</object>
<packing>
<property name="expand">False</property>
commit e4653eee7680831e6d0995d51d80fb63309c03ab
Author: Herbert Dürr <hdu at apache.org>
Date: Thu Jan 23 16:56:03 2014 +0000
Related: #i123895# adjust VCL support for 64bit OSX port
(cherry picked from commit 677d987b931c509c4240840c4f21ccad2b518b12)
Conflicts:
vcl/aqua/source/a11y/aqua11ywrapperrow.mm
vcl/inc/aqua/aquavcltypes.h
vcl/inc/quartz/salgdi.h
vcl/osx/DropTarget.cxx
vcl/osx/salframe.cxx
vcl/osx/salinst.cxx
vcl/osx/salmenu.cxx
vcl/osx/vclnsapp.mm
Change-Id: I30d72e7caa1269982d176bc4d3baf604d5e7a84b
diff --git a/vcl/inc/osx/salframeview.h b/vcl/inc/osx/salframeview.h
index 3217499..db3d588 100644
--- a/vcl/inc/osx/salframeview.h
+++ b/vcl/inc/osx/salframeview.h
@@ -22,7 +22,7 @@
#include "osx/a11ywrapper.h"
- at interface SalFrameWindow : NSWindow
+ at interface SalFrameWindow : NSWindow<NSWindowDelegate>
{
AquaSalFrame* mpFrame;
id mDraggingDestinationHandler;
@@ -38,6 +38,9 @@
-(void)windowDidMiniaturize: (NSNotification*)pNotification;
-(void)windowDidDeminiaturize: (NSNotification*)pNotification;
-(BOOL)windowShouldClose: (NSNotification*)pNotification;
+//-(void)willEncodeRestorableState:(NSCoder*)pCoderState;
+//-(void)didDecodeRestorableState:(NSCoder*)pCoderState;
+//-(void)windowWillEnterVersionBrowser:(NSNotification*)pNotification;
-(void)dockMenuItemTriggered: (id)sender;
-(AquaSalFrame*)getSalFrame;
-(BOOL)containsMouse;
diff --git a/vcl/osx/DropTarget.cxx b/vcl/osx/DropTarget.cxx
index e4d3a6b..3a75f44 100644
--- a/vcl/osx/DropTarget.cxx
+++ b/vcl/osx/DropTarget.cxx
@@ -285,19 +285,13 @@ NSDragOperation DropTarget::draggingUpdated(id sender)
//NSLog(@"Drag update: Source actions: %x proposed action %x selected action %x", mDragSourceSupportedActions, currentAction, mSelectedDropAction);
}
-#ifndef __LP64__
- // Weird but it appears as if there is no method in Cocoa
- // to create a kThemeCopyArrowCursor hence we have to use
- // Carbon to do it
if (dragOp == NSDragOperationNone)
- SetThemeCursor(kThemeNotAllowedCursor);
+ [[NSCursor operationNotAllowedCursor] set];
else if (dragOp == NSDragOperationCopy)
- SetThemeCursor(kThemeCopyArrowCursor);
+ [[NSCursor dragCopyCursor] set];
else
- SetThemeCursor(kThemeArrowCursor);
-#else
- // FIXME: SetThemeCursor replacement?
-#endif
+ [[NSCursor arrowCursor] set];
+
return dragOp;
}
@@ -308,9 +302,7 @@ void DropTarget::draggingExited(id /*sender*/)
fire_dragExit(dte);
mDragSourceSupportedActions = DNDConstants::ACTION_NONE;
mSelectedDropAction = DNDConstants::ACTION_NONE;
-#ifndef __LP64__
- SetThemeCursor(kThemeArrowCursor);
-#endif
+ [[NSCursor arrowCursor] set];
}
@@ -364,9 +356,7 @@ void DropTarget::concludeDragOperation(id /*sender*/)
mDragSourceSupportedActions = DNDConstants::ACTION_NONE;
mSelectedDropAction = DNDConstants::ACTION_NONE;
mXCurrentDragClipboard = uno::Reference<XClipboard>();
-#ifndef __LP64__
- SetThemeCursor(kThemeArrowCursor);
-#endif
+ [[NSCursor arrowCursor] set];
}
diff --git a/vcl/osx/a11ywrapperrow.mm b/vcl/osx/a11ywrapperrow.mm
index 8bcef80..98739e6 100644
--- a/vcl/osx/a11ywrapperrow.mm
+++ b/vcl/osx/a11ywrapperrow.mm
@@ -28,7 +28,8 @@
@implementation AquaA11yWrapperRow : AquaA11yWrapper
-(id)disclosingAttribute {
- return NULL; // TODO
+ // TODO: implement
+ return nil;
}
-(NSArray *)accessibilityAttributeNames {
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 6d47cc6..6b236d6 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -200,17 +200,7 @@ void AquaSalFrame::initWindowAndView()
else
[mpNSWindow setAcceptsMouseMovedEvents: YES];
[mpNSWindow setHasShadow: YES];
-
- // WTF? With the 10.6 SDK and gcc 4.2.1, we get: class 'NSWindow'
- // does not implement the 'NSWindowDelegate' protocol. Anyway,
- // having the window object be its own delegate object is
- // apparently what the code does on purpose, see discussion in
- // https://issues.apache.org/ooo/show_bug.cgi?id=91990
-
- // So to silence the warning when compiling with -Werror, instead of:
- // [mpNSWindow setDelegate: mpNSWindow];
- // do this:
- objc_msgSend(mpNSWindow, @selector(setDelegate:), mpNSWindow);
+ [mpNSWindow setDelegate: static_cast<id<NSWindowDelegate> >(mpNSWindow)];
if( [mpNSWindow respondsToSelector: @selector(setRestorable:)])
{
diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx
index db3dd2e..d906727 100644
--- a/vcl/osx/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -253,15 +253,7 @@ AquaSalMenu::AquaSalMenu( bool bMenuBar ) :
if( ! mbMenuBar )
{
mpMenu = [[SalNSMenu alloc] initWithMenu: this];
- // With the 10.6 SDK and gcc 4.2.1, we get: class 'NSMenu'
- // does not implement the 'NSMenuDelegate' protocol. Anyway,
- // having the menu object be its own delegate object is
- // apparently what the code does on purpose.
-
- // So to silcense the warning, instead of:
- // [mpMenu setDelegate: mpMenu];
- // do this:
- objc_msgSend(mpMenu, @selector(setDelegate:), mpMenu);
+ [mpMenu setDelegate: (id<NSMenuDelegate>)mpMenu];
}
else
{
diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm
index 18079fb..0c0fe69 100644
--- a/vcl/osx/vclnsapp.mm
+++ b/vcl/osx/vclnsapp.mm
@@ -82,19 +82,7 @@
if( nModMask == NSCommandKeyMask
&& [[pEvent charactersIgnoringModifiers] isEqualToString: @"w"] )
{
- // Note: gcc 4.2.1 (in the 10.6 SDK) tells us
- // 'NSWindow' may not respond to
- // '-windowShouldClose:' . Is that a bogus
- // warning, or is this code bogus? No idea.
- // Anyway, so that we can compile also against
- // this SDK with -Werror, use objc_msgSend
- // instead.
-
- // Instead of:
- // [pFrame->getNSWindow() windowShouldClose: nil];
- // do:
- objc_msgSend(pFrame->getNSWindow(), @selector(windowShouldClose:), nil);
-
+ [(SalFrameWindow*)pFrame->getNSWindow() windowShouldClose: nil];
return;
}
}
diff --git a/vcl/quartz/salgdiutils.cxx b/vcl/quartz/salgdiutils.cxx
index c48089f..295719e 100644
--- a/vcl/quartz/salgdiutils.cxx
+++ b/vcl/quartz/salgdiutils.cxx
@@ -166,7 +166,7 @@ void AquaSalGraphics::SetState()
bool AquaSalGraphics::CheckContext()
{
- if( mbWindow && mpFrame != NULL )
+ if( mbWindow && mpFrame && mpFrame->getNSWindow() )
{
const unsigned int nWidth = mpFrame->maGeometry.nWidth;
const unsigned int nHeight = mpFrame->maGeometry.nHeight;
More information about the Libreoffice-commits
mailing list