[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source cui/uiconfig
Efe Gürkan YALAMAN
efeyalaman at gmail.com
Mon Jun 24 12:02:25 PDT 2013
cui/source/inc/cuires.hrc | 1 +
cui/source/options/optaboutconfig.cxx | 29 +++++++++++++++++++++++++++++
cui/source/options/optaboutconfig.hxx | 11 +++++++----
cui/source/options/treeopt.cxx | 3 +++
cui/uiconfig/ui/aboutconfigdialog.ui | 2 +-
5 files changed, 41 insertions(+), 5 deletions(-)
New commits:
commit 04ceced83f76224a0ab1bd270071b541db3ed419
Author: Efe Gürkan YALAMAN <efeyalaman at gmail.com>
Date: Mon Jun 24 21:50:23 2013 +0300
Initial files are improved.
Some typos fixed on header files.
Change-Id: Ibd6f1b666a3a5b8b6a943b1bffae0be262bcf2fa
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index bdb022d..19a292f 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -155,6 +155,7 @@
#define RID_OFAPAGE_SMARTTAG_OPTIONS (RID_OFA_START + 125)
#define RID_SVXPAGE_OPTIONS_CTL (RID_SVX_START + 252)
#define RID_SVXPAGE_OPTIONS_JAVA (RID_SVX_START + 253)
+#define RID_SVXPAGE_ABOUT_CONFIG (RID_SVX_START + 301)
#define RID_SVXPAGE_ACCESSIBILITYCONFIG (RID_SVX_START + 250)
#define RID_SVXPAGE_ASIAN_LAYOUT (RID_SVX_START + 246)
#define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299)
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
new file mode 100644
index 0000000..e96829c
--- /dev/null
+++ b/cui/source/options/optaboutconfig.cxx
@@ -0,0 +1,29 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "optaboutconfig.hxx"
+
+CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* pParent, const SfxItemSet& rItemSet )
+ :SfxTabPage( pParent, "AboutConfig", "cui/ui/optaboutconfigdialog.ui")
+{
+// get(m_pEditBtn, "");
+
+ WinBits nBits = WB_SCROLL | WB_SORT;
+ pPrefBox = new OptHeaderTabListBox( pPrefCtrl, nbits );
+}
+
+CuiAboutConfigTabPage::~CuiAboutConfigTabPage()
+{
+}
+
+SfxTabPage* CuiAboutConfigTabPage::Create( Window* pParent, const SfxItemSet& rItemSet )
+{
+ return ( new CuiAboutConfigTabPage( pParent, rItemSet) );
+}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx
index 68fb0c5..3d7859d 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -10,13 +10,13 @@
#ifndef INCLUDED_CUI_OPTABOUTCONFIG_HXX
#define INCLUDED_CUI_OPTBABOUTCONFIG_HXX
-#include <svx/simpltabl.hxx>
+#include <svx/simptabl.hxx>
namespace cui
{
class OptHeaderTabListBox;
}
-
+class CuiAboutConfigTabPage;
class CuiAboutConfigTabPage : public SfxTabPage
{
@@ -31,7 +31,10 @@ public:
CuiAboutConfigTabPage( Window* pParent, const SfxItemSet& rItemSet );
~CuiAboutConfigTabPage();
- static SfxTabPage* create( Window* pParent, const SfxItemSet& rItemset );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rItemset );
+
+};
+
+#endif
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 33f2b79..fde7cbd 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -32,6 +32,7 @@
#include "dbregisterednamesconfig.hxx"
#include "dialmgr.hxx"
#include "fontsubs.hxx"
+#include "optaboutconfig.hxx"
#include "optaccessibility.hxx"
#include "optasian.hxx"
#include "optchart.hxx"
@@ -317,6 +318,7 @@ SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItem
case RID_SVXPAGE_OPTIONS_JAVA: fnCreate = &SvxJavaOptionsPage::Create ; break;
case RID_SVXPAGE_ONLINEUPDATE: fnCreate = &SvxOnlineUpdateTabPage::Create; break;
case RID_OPTPAGE_CHART_DEFCOLORS: fnCreate = &SvxDefaultColorOptPage::Create; break;
+ case RID_SVXPAGE_ABOUT_CONFIG: fnCreate = &CuiAboutConfigTabPage::Create; break;
}
SfxTabPage* pRet = fnCreate ? (*fnCreate)( pParent, rSet ) : NULL;
@@ -348,6 +350,7 @@ static OptionsMapping_Impl const OptionsMap_Impl[] =
{ "ProductName", "Accessibility", RID_SVXPAGE_ACCESSIBILITYCONFIG },
{ "ProductName", "Java", RID_SVXPAGE_OPTIONS_JAVA },
{ "ProductName", "OnlineUpdate", RID_SVXPAGE_ONLINEUPDATE },
+ { "ProductName", "AboutConfig", RID_SVXPAGE_ABOUT_CONFIG },
{ "LanguageSettings", NULL, SID_LANGUAGE_OPTIONS },
{ "LanguageSettings", "Languages", OFA_TP_LANGUAGES },
{ "LanguageSettings", "WritingAids", RID_SFXPAGE_LINGU },
diff --git a/cui/uiconfig/ui/aboutconfigdialog.ui b/cui/uiconfig/ui/aboutconfigdialog.ui
index 960200e..d038bfe 100644
--- a/cui/uiconfig/ui/aboutconfigdialog.ui
+++ b/cui/uiconfig/ui/aboutconfigdialog.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkDialog" id="aboutconfig">
+ <object class="GtkDialog" id="AboutConfig">
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Advanced Options</property>
More information about the Libreoffice-commits
mailing list