[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source
cui/source/options/optaboutconfig.cxx | 16 ++--
1 file changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 48ad992534d2995a39fc122c6511f75b8dc688d1
Author: Efe Gürkan YALAMAN
Date: Wed Jul 31 22:01:07 2013 +0300
Hardcoded 3 toplevel configuration names for merging to master
Change-Id: Ic4271291f6f0adc66a69f5d9cd1b10c3393503cd
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 7f890a1..71a04d1 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -95,9 +95,21 @@ void CuiAboutConfigTabPage::Reset( const SfxItemSet& )
m_pDefaultBtn->Enable(sal_False);
m_pEditBtn->Enable(sal_False);
- Reference< XNameAccess > xConfigAccess = getConfigAccess( sRootNodePath,
sal_False );
+ OUString array[ 3 ] = {
+ "/org.openoffice.Office.Common",
+ "/org.openoffice.Office.Math",
+ "/org.openoffice.Office.Addons" };
- FillItems( xConfigAccess, sRootNodePath );
+for (sal_Int16 nInd = 0; nInd < 3 ; ++nInd )
+{
+sRootNodePath = array[nInd];
+Reference< XNameAccess > xConfigAccess = getConfigAccess(
sRootNodePath, sal_False );
+FillItems( xConfigAccess, sRootNodePath );
+}
+
+ //Reference< XNameAccess > xConfigAccess = getConfigAccess( sRootNodePath,
sal_False );
+
+ //FillItems( xConfigAccess, sRootNodePath );
}
void CuiAboutConfigTabPage::FillItems( Reference< XNameAccess >xNameAccess,
OUString sPath)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source cui/uiconfig
cui/source/options/optaboutconfig.cxx | 61 ++
cui/uiconfig/ui/aboutconfigdialog.ui |4 +-
2 files changed, 36 insertions(+), 29 deletions(-)
New commits:
commit 19f5cd76ea04dc41fbcceced439ed2c13ce4eab4
Author: Efe Gürkan YALAMAN
Date: Tue Jul 30 00:54:11 2013 +0300
Cosmetic changes for experimental features
Change-Id: Ia7ade29a2780881f53799cb57100ff60495d9d88
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 688b48b..7f890a1 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -26,10 +26,10 @@ using namespace ::com::sun::star;
using namespace com::sun::star::uno;
using namespace com::sun::star::container;
-#define ITEMID_PREF 1
-#define ITEMID_TYPE 2
-#define ITEMID_STATUS 3
-#define ITEMID_VALUE4
+#define ITEMID_PREFNAME 1
+#define ITEMID_PROPERTY 2
+#define ITEMID_TYPE 3
+#define ITEMID_VALUE4
CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* pParent, const
SfxItemSet& rItemSet )
:SfxTabPage( pParent, "AboutConfig", "cui/ui/aboutconfigdialog.ui",
rItemSet)
@@ -49,16 +49,16 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window*
pParent, const SfxItemSet&
m_pEditBtn->SetClickHdl( LINK( this, CuiAboutConfigTabPage,
StandardHdl_Impl ) );
HeaderBar &rBar = pPrefBox->GetTheHeaderBar();
-rBar.InsertItem( ITEMID_PREF, get("preference")->GetText(), 0,
HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW);
-rBar.InsertItem( ITEMID_TYPE, get("status")->GetText(), 0,
HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW );
-rBar.InsertItem( ITEMID_STATUS, get("type")->GetText(), 0,
HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW );
+rBar.InsertItem( ITEMID_PREFNAME, get("preference")->GetText(),
0, HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW);
+rBar.InsertItem( ITEMID_PROPERTY, get("property")->GetText(),
0, HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW );
+rBar.InsertItem( ITEMID_TYPE, get("type")->GetText(), 0,
HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW );
rBar.InsertItem( ITEMID_VALUE, get("value")->GetText(), 0,
HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW );
-long aTabs[] = {4,0,12,12,12};
+long aTabs[] = {4,120,50,50,50};//TODO: Not works correctly hardcoded for
now.
aTabs[2] += aTabs[1] + rBar.GetTextWidth(rBar.GetItemText(1));
-aTabs[3] += aTabs[2] + rBar.GetTextWidth(rBar.GetItemText(2));
-aTabs[4] += aTabs[3] + rBar.GetTextWidth(rBar.GetItemText(3));
+aTabs[3] += aTabs[2] + 160; //rBar.GetTextWidth(rBar.GetItemText(2));
+aTabs[4] += aTabs[3] + 40; //rBar.GetTextWidth(rBar.GetItemText(3));
pPrefBox->SetTabs(aTabs, MAP_PIXEL);
@@ -92,6 +92,9 @@ void CuiAboutConfigTabPage::Reset( const SfxItemSet& )
OUString sRootNodePath = "/";
pPrefBox->Clear();
+ m_pDefaultBtn->Enable(sal_False);
+ m_pEditBtn->Enable(sal_False);
+
Reference< XNameAccess > xConfigAccess = getConfigAccess( sRootNodePath,
sal_False );
FillItems( xConfigAccess, sRootNodePath );
@@ -103,6 +106,8 @@ void CuiAboutConfigTabPage::FillItems( Reference<
XNameAccess >xNameAccess, OUSt
Reference< XHierarchicalNameAccess > xHierarchicalNameAccess( xNameAccess,
uno::UNO_QUERY_THROW );
+pPrefBox->SetUpdateMode(sal_False);
+
uno::Sequence< OUString > seqItems = xNameAccess->getElementNames();
for( sal_Int16 i = 0; i < seqItems.getLength(); ++i )
{
@@ -127,7 +132,7 @@ void CuiAboutConfigTabPage::FillItems( Reference<
XNameAccess >xNameAccess, OUSt
{
Any aProp =
xHierarchicalNameAccess->getByHierarchicalName(seqItems[i]);
//xProperty->getAsProperty();
-OUString test;
+OUString sValue;
if( aProp.hasValue() )
{
switch( aProp.getValueType().getTypeClass() )
@@ -142,7 +147,7 @@ void CuiAboutConfigTabPage::FillItems( Reference<
XNameAccess >xNameAccess, OUSt
if(aProp >>= nVal)
{
OUString aNumber( OUString::valueOf( nVal ) );
-test = aNumber;
+sValue = aNumber;
}
}
break;
@@ -153,7 +158,7 @@ void CuiAboutConfigTabPage::FillItems( Reference<
XNameAccess >xNameAccess, OUSt
if(aProp >>= bVal )
{
OUString sBoolean( OUString::valueOf( bVal ) );
-test = sBoolean;
+sValue = sBoolean;
}
}
break;
@@ -163,7 +168,7 @@ void CuiAboutConfigTabPage::FillItems( Reference<
XNameAccess >xNameAccess, OUSt
OUString sString;
if(aProp >>= sString)
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source
cui/source/options/optaboutconfig.cxx | 36 ++
cui/source/options/optaboutconfig.hxx |2 +
2 files changed, 34 insertions(+), 4 deletions(-)
New commits:
commit 6a2c82bba50a338dce72ffaae0b2b8c9252aeaea
Author: Efe Gürkan YALAMAN
Date: Sat Jul 27 01:17:54 2013 +0300
Header bar sorting implemented.
Change-Id: I2c80b6f7973053c78af430b458ae2f9e5532532e
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 56c0d0a..c36a195 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -47,10 +47,10 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window*
pParent, const SfxItemSet&
pPrefBox = new svx::OptHeaderTabListBox( *m_pPrefCtrl, nBits );
HeaderBar &rBar = pPrefBox->GetTheHeaderBar();
-rBar.InsertItem( ITEMID_PREF, get("preference")->GetText(), 0,
HIB_LEFT | HIB_VCENTER );
-rBar.InsertItem( ITEMID_TYPE, get("status")->GetText(), 0,
HIB_LEFT | HIB_VCENTER );
-rBar.InsertItem( ITEMID_STATUS, get("type")->GetText(), 0,
HIB_LEFT | HIB_VCENTER );
-rBar.InsertItem( ITEMID_VALUE, get("value")->GetText(), 0,
HIB_LEFT | HIB_VCENTER );
+rBar.InsertItem( ITEMID_PREF, get("preference")->GetText(), 0,
HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW);
+rBar.InsertItem( ITEMID_TYPE, get("status")->GetText(), 0,
HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW );
+rBar.InsertItem( ITEMID_STATUS, get("type")->GetText(), 0,
HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW );
+rBar.InsertItem( ITEMID_VALUE, get("value")->GetText(), 0,
HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW );
long aTabs[] = {4,0,12,12,12};
@@ -235,4 +235,32 @@ Reference< XNameAccess >
CuiAboutConfigTabPage::getConfigAccess( OUString sNodeP
return xNameAccess;
}
+
+IMPL_LINK( CuiAboutConfigTabPage, HeaderSelect_Impl, HeaderBar*, pBar )
+{
+if ( pBar && pBar->GetCurItemId() != ITEMID_TYPE )
+return 0;
+
+HeaderBarItemBits nBits = pBar->GetItemBits(ITEMID_TYPE);
+sal_Bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW );
+SvSortMode eMode = SortAscending;
+
+if ( bUp )
+{
+nBits &= ~HIB_UPARROW;
+nBits |= HIB_DOWNARROW;
+eMode = SortDescending;
+}
+else
+{
+nBits &= ~HIB_DOWNARROW;
+nBits |= HIB_UPARROW;
+}
+pBar->SetItemBits( ITEMID_TYPE, nBits );
+SvTreeList* pModel = pPrefBox->GetModel();
+pModel->SetSortMode( eMode );
+pModel->Resort();
+return 1;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
index 9421328..22661d7 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -31,6 +31,8 @@ private:
::svx::OptHeaderTabListBox* pPrefBox;
CuiAboutConfigTabPage( Window* pParent, const SfxItemSet& rItemSet );
~CuiAboutConfigTabPage();
+
+DECL_LINK( HeaderSelect_Impl, HeaderBar * );
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rItemset );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source
cui/source/options/optaboutconfig.cxx | 33 +
1 file changed, 33 insertions(+)
New commits:
commit 409e9267f26d0c2a6b6099acb2ed5c3d2276f66c
Author: Efe Gürkan YALAMAN
Date: Sat Jul 27 01:00:19 2013 +0300
string and long sequence's added.
Change-Id: I46b6eed7a509ba6793f8e2b2a148acae3f4d06cc
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 7b2fbad..56c0d0a 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -167,6 +167,39 @@ void CuiAboutConfigTabPage::FillItems( Reference<
XNameAccess >xNameAccess, OUSt
}
break;
+case ::com::sun::star::uno::TypeClass_SEQUENCE :
+//case ::com::sun::star::uno::TypeClass_ARRAY :
+{
+test = OUString("");
+if(
OUString("[]long").equals(aProp.getValueTypeName()) )
+{
+uno::Sequence seqLong;
+if( aProp >>= seqLong )
+{
+//test = OUString("Congrats bro!");
+for(sal_Int16 nInd=0; nInd <
seqLong.getLength(); ++nInd)
+{
+OUString sNumber(
OUString::valueOf(seqLong[nInd]) );
+test += sNumber;
+test += OUString(",");
+}
+}
+}
+
+if( OUString("[]string") == aProp.getValueTypeName() )
+{
+uno::Sequence< OUString > seqOUString;
+if( aProp >>= seqOUString )
+{
+for( sal_Int16 nInd=0; nInd <
seqOUString.getLength(); ++nInd )
+{
+test += seqOUString[nInd] + OUString(",");
+}
+}
+}
+}
+break;
+
default:
{
test = OUString("test");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source
cui/source/options/optaboutconfig.cxx | 22 ++
1 file changed, 22 insertions(+)
New commits:
commit 0d49b2f86b155a95967657533050ab028d14d824
Author: Efe Gürkan YALAMAN
Date: Sat Jul 27 00:02:10 2013 +0300
Boolean and string types added for representation.
Change-Id: I5e325ec36ee6977cd8916ea1edc552db7a35af52
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index ea66de6..7b2fbad 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -145,6 +145,28 @@ void CuiAboutConfigTabPage::FillItems( Reference<
XNameAccess >xNameAccess, OUSt
}
break;
+case ::com::sun::star::uno::TypeClass_BOOLEAN :
+{
+sal_Bool bVal = sal_False;
+if(aProp >>= bVal )
+{
+OUString sBoolean( OUString::valueOf( bVal ) );
+test = sBoolean;
+}
+}
+break;
+
+case ::com::sun::star::uno::TypeClass_STRING :
+{
+OUString sString;
+if(aProp >>= sString)
+{
+test = sString;
+}
+
+}
+break;
+
default:
{
test = OUString("test");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source
cui/source/options/optaboutconfig.cxx | 36 ++
1 file changed, 32 insertions(+), 4 deletions(-)
New commits:
commit 67e1d504e11611528d84fb1f592efd06b818fcb4
Author: Efe Gürkan YALAMAN
Date: Fri Jul 26 02:25:27 2013 +0300
initial implementation of mapping values
Change-Id: I04aae2c6586967b8788e6b3fcd2752b893831937
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 3a04e39..ea66de6 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -123,10 +123,38 @@ void CuiAboutConfigTabPage::FillItems( Reference<
XNameAccess >xNameAccess, OUSt
if( bIsLeafNode )
{
-Reference< beans::XProperty > xProperty ( xNameAccess,
uno::UNO_QUERY_THROW ) ;
-beans::Property aProp = xProperty->getAsProperty();
-OUString test = aProp.Type.getTypeName();
-InsertEntry( sPath, test, sPath, sPath );//for testing only will
change
+Any aProp =
xHierarchicalNameAccess->getByHierarchicalName(seqItems[i]);
//xProperty->getAsProperty();
+
+OUString test;
+if( aProp.hasValue() )
+{
+switch( aProp.getValueType().getTypeClass() )
+{
+case ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT :
+case ::com::sun::star::uno::TypeClass_SHORT :
+case ::com::sun::star::uno::TypeClass_UNSIGNED_LONG :
+case ::com::sun::star::uno::TypeClass_LONG :
+//case ::com::sun::star::uno::TypeClass_INT :
+{
+sal_Int32 nVal = 0;
+if(aProp >>= nVal)
+{
+OUString aNumber( OUString::valueOf( nVal ) );
+test = aNumber;
+}
+}
+break;
+
+default:
+{
+test = OUString("test");
+}
+}
+}
+
+OUString sType = aProp.getValueTypeName();//.getTypeName()
;//Type.getTypeName();
+OUString sPrefName = sPath + OUString("-") + seqItems[i] ;
+InsertEntry( sPrefName, test, sType , sPath );//for testing only
will change
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source
cui/source/options/optaboutconfig.cxx |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 60f98e3e9a2654b858be55b98425d3e81de5b3ac
Author: Efe Gürkan YALAMAN
Date: Thu Jul 25 00:50:43 2013 +0300
Page testing loads options to the LB
Formatting is not at the last version. Page loads all options to the
listbox.
Change-Id: Ic83817ff56411599389d549e6c135e0275dd940c
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index af4501f..3a04e39 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -16,6 +16,7 @@
#include
#include
#include
+#include
#include
#include
@@ -75,6 +76,7 @@ void CuiAboutConfigTabPage::InsertEntry( OUString& rProp,
OUString& rStatus, OU
{
SvTreeListEntry* pEntry = new SvTreeListEntry;
+pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0));
//It is needed, otherwise causes crash
pEntry->AddItem( new SvLBoxString( pEntry, 0, rProp));
pEntry->AddItem( new SvLBoxString( pEntry, 0, rStatus));
pEntry->AddItem( new SvLBoxString( pEntry, 0, rType));
@@ -121,9 +123,10 @@ void CuiAboutConfigTabPage::FillItems( Reference<
XNameAccess >xNameAccess, OUSt
if( bIsLeafNode )
{
-//InsertEntry( sPath, "", "", "");
-//Reference< beans::Property > aProperty =
xHierarchicalNameAccess->getAsProperty();//getPropertyValue( seqItems[ i ] );
-//InsertEntry( sPath + OUString("/") + seqItems[ i ],
OUString(""), OUString(""), xHierarchicalNameAccess->getByHierarchicalName(
seqItems[ i ] ).Value );
+Reference< beans::XProperty > xProperty ( xNameAccess,
uno::UNO_QUERY_THROW ) ;
+beans::Property aProp = xProperty->getAsProperty();
+OUString test = aProp.Type.getTypeName();
+InsertEntry( sPath, test, sPath, sPath );//for testing only will
change
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source
cui/source/options/optaboutconfig.cxx |9 +
cui/source/options/optaboutconfig.hxx |2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 6f4bff0e8acd7b05dbebcaeb26f679d7ec97f32d
Author: Efe Gürkan YALAMAN
Date: Wed Jul 24 22:13:31 2013 +0300
configaccess and FillItems can take '/' as nodepath
The problem about taking '/' as nodepath solved.
Change-Id: I9590a7bec95c8d90d18bfe55fdb7ab19043ccb55
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 0b9eb61..af4501f 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -85,11 +85,12 @@ void CuiAboutConfigTabPage::InsertEntry( OUString& rProp,
OUString& rStatus, OU
void CuiAboutConfigTabPage::Reset( const SfxItemSet& )
{
+ OUString sRootNodePath = "/";
pPrefBox->Clear();
- Reference< XNameAccess > xConfigAccess = getConfigAccess();
+ Reference< XNameAccess > xConfigAccess = getConfigAccess( sRootNodePath );
- FillItems( xConfigAccess, OUString("org.openoffice.Office.Canvas") );
+ FillItems( xConfigAccess, sRootNodePath );
}
void CuiAboutConfigTabPage::FillItems( Reference< XNameAccess >xNameAccess,
OUString sPath)
@@ -127,7 +128,7 @@ void CuiAboutConfigTabPage::FillItems( Reference<
XNameAccess >xNameAccess, OUSt
}
}
-Reference< XNameAccess > CuiAboutConfigTabPage::getConfigAccess()
+Reference< XNameAccess > CuiAboutConfigTabPage::getConfigAccess( OUString
sNodePath )
{
uno::Reference< uno::XComponentContext > xContext(
::comphelper::getProcessComponentContext() );
@@ -136,7 +137,7 @@ Reference< XNameAccess >
CuiAboutConfigTabPage::getConfigAccess()
beans::NamedValue aProperty;
aProperty.Name = "nodepath";
-aProperty.Value = uno::makeAny( OUString("org.openoffice.Office.Canvas") );
+aProperty.Value = uno::makeAny( sNodePath );
uno::Sequence< uno::Any > aArgumentList( 1 );
aArgumentList[0] = uno::makeAny( aProperty );
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
index 343f0c9..9421328 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -37,7 +37,7 @@ public:
void InsertEntry(OUString& rProp, OUString& rStatus, OUString& rType,
OUString& rValue);
void Reset( const SfxItemSet& );
void FillItems( com::sun::star::uno::Reference <
com::sun::star::container::XNameAccess > xNameAccess, OUString sPath);
- com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >
getConfigAccess();
+ com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >
getConfigAccess( OUString sNodePath );
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source
cui/source/options/optaboutconfig.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit d6922c0c193eda5245f7088456973878d635f8a1
Author: Efe Gürkan YALAMAN
Date: Wed Jul 24 02:00:05 2013 +0300
Tabpage doesn't crash on load and traverses configurations
Tabpage now works without crashing. It also traverses configurations.
Traversed configurations doesn't display yet. But traversal can be seen
when debugging. Root of the traversal should be given as a until "/"
part. For example "org.openoffice" not accepted. But
"org.openoffice.Office.Canvas" accepted.
Change-Id: I2d3026781bfaafa0f721b317249c8879f103bd05
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index b7072c3..0b9eb61 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -89,7 +89,7 @@ void CuiAboutConfigTabPage::Reset( const SfxItemSet& )
Reference< XNameAccess > xConfigAccess = getConfigAccess();
- FillItems( xConfigAccess, OUString("org.openoffice") );
+ FillItems( xConfigAccess, OUString("org.openoffice.Office.Canvas") );
}
void CuiAboutConfigTabPage::FillItems( Reference< XNameAccess >xNameAccess,
OUString sPath)
@@ -102,13 +102,13 @@ void CuiAboutConfigTabPage::FillItems( Reference<
XNameAccess >xNameAccess, OUSt
for( sal_Int16 i = 0; i < seqItems.getLength(); ++i )
{
Any aNode = xHierarchicalNameAccess->getByHierarchicalName(
seqItems[i] );
-Reference< XHierarchicalNameAccess >xNextHierarchicalNameAccess(
aNode, uno::UNO_QUERY_THROW );
-Reference< XNameAccess > xNextNameAccess( xNextHierarchicalNameAccess,
uno::UNO_QUERY_THROW );
bIsLeafNode = sal_True;
try
{
+Reference< XHierarchicalNameAccess >xNextHierarchicalNameAccess(
aNode, uno::UNO_QUERY_THROW );
+Reference< XNameAccess > xNextNameAccess(
xNextHierarchicalNameAccess, uno::UNO_QUERY_THROW );
uno::Sequence < OUString > seqNext =
xNextNameAccess->getElementNames();
FillItems( xNextNameAccess, sPath + OUString("/") + seqItems[i] );
bIsLeafNode = sal_False;
@@ -122,7 +122,7 @@ void CuiAboutConfigTabPage::FillItems( Reference<
XNameAccess >xNameAccess, OUSt
{
//InsertEntry( sPath, "", "", "");
//Reference< beans::Property > aProperty =
xHierarchicalNameAccess->getAsProperty();//getPropertyValue( seqItems[ i ] );
-//InsertEntry( sPath + OUString("/") + seqItems[ i ],
OUString(""), OUString(""), xNameAccess->getPropertyValue( seqItems[ i ] ) );
+//InsertEntry( sPath + OUString("/") + seqItems[ i ],
OUString(""), OUString(""), xHierarchicalNameAccess->getByHierarchicalName(
seqItems[ i ] ).Value );
}
}
}
@@ -136,7 +136,7 @@ Reference< XNameAccess >
CuiAboutConfigTabPage::getConfigAccess()
beans::NamedValue aProperty;
aProperty.Name = "nodepath";
-aProperty.Value = uno::makeAny( OUString("org.openoffice") );
+aProperty.Value = uno::makeAny( OUString("org.openoffice.Office.Canvas") );
uno::Sequence< uno::Any > aArgumentList( 1 );
aArgumentList[0] = uno::makeAny( aProperty );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source
cui/source/options/optaboutconfig.cxx | 53 ++
cui/source/options/optaboutconfig.hxx |6 +--
2 files changed, 51 insertions(+), 8 deletions(-)
New commits:
commit 69892393f2588767e1d380ad0fc9d8e812a9713f
Author: Efe Gürkan YALAMAN
Date: Mon Jul 22 23:09:28 2013 +0300
Draft for FillItems
Change-Id: Iefd8a21d1cb27496c87502755834c31b1a35ba44
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 09805c0..6bc02bf 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -16,10 +16,14 @@
#include
#include
#include
+#include
+#include
using namespace svx;
using namespace ::com::sun::star;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::container;
#define ITEMID_PREF 1
#define ITEMID_TYPE 2
@@ -79,12 +83,44 @@ void CuiAboutConfigTabPage::InsertEntry( OUString& rProp,
OUString& rStatus, OU
pPrefBox->Insert( pEntry );
}
-sal_Bool CuiAboutConfigTabPage::FillItems()
+
+void CuiAboutConfigTabPage::FillItems( Reference< XNameAccess >xNameAccess,
+Reference< XHierarchicalNameAccess > xHierarchicalNameAccess, OUString
sPath)
{
-return sal_False;
+sal_Bool bIsLeafNode;
+//Reference< XNameAccess > xNameAccess = getConfigAccess();
+//Reference< XHierarchicalNameAccess > xNextHierarchicalNameAccess;
+
+uno::Sequence< OUString > seqItems = xNameAccess->getElementNames();
+for( sal_Int16 i = 0; i < seqItems.getLength(); ++i )
+{
+xHierarchicalNextNameAccess =
xHierarchicalNameAccess->getByHierarchicalName( seqItems[i] );
+
+//getConfigAccess for nextNameAccess ? with
xHierarchicalNextName.getName()
+
+bIsLeafNode = sal_True;
+
+try
+{
+uno::Sequence < OUString > seqNext =
xNextNameAccess->getElementNames();
+FillItems( xHierarchicalNextAccess, sPath + OUString("/") +
seqItems[i] );
+bIsLeafNode = sal_False;
+
+}
+catch( uno::Exception& )
+{
+}
+
+if( bIsLeafNode )
+{
+InsertEntry( sPath, "", "", "");
+}
+}
}
-uno::Reference< container::XNameAccess >
CuiAboutConfigTabPage::getConfigAccess()
+//uno::Reference< XNameAccess > CuiAboutConfigTabPage::getConfigAccess(
sal_Bool isHierarchical )
+void CuiAboutConfigTabPage::getConfigAccess( Reference< XNameAccess >&
xNameAccess,
+Reference< XHierarchicalNameAccess >& xHierarchicalNameAccess )
{
uno::Reference< uno::XComponentContext > xContext(
::comphelper::getProcessComponentContext() );
@@ -98,11 +134,18 @@ uno::Reference< container::XNameAccess >
CuiAboutConfigTabPage::getConfigAccess(
uno::Sequence< uno::Any > aArgumentList( 1 );
aArgumentList[0] = uno::makeAny( aProperty );
-uno::Reference< container::XNameAccess > xNameAccess(
+uno::Reference< container::XNameAccess > xNameAcc(
xConfigProvider->createInstanceWithArguments(
"com.sun.star.configuration.ConfigurationAccess",
aArgumentList ),
uno::UNO_QUERY_THROW );
-return xNameAccess;
+Reference< XHierarchicalNameAccess > xHierarchicalNameAcc(
+xConfigProvider->createInstanceWithArguments(
+"com.sun.star.configuration.ConfigurationAccess",
aArgumentList ),
+uno::UNO_QUERY_THROW );
+
+xNameAccess = xNameAcc;
+xHierarchicalNameAccess = xHierarchicalNameAcc;
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
index eb446dc..947009e 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -13,7 +13,7 @@
#include
#include
#include "optHeaderTabListbox.hxx"
-#include
+#include
namespace svx
{
@@ -35,8 +35,8 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rItemset );
void InsertEntry(OUString& rProp, OUString& rStatus, OUString& rType,
OUString& rValue);
- sal_Bool FillItems();
- com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >
getConfigAccess();
+ void FillItems( com::sun::star::uno::Reference <
com::sun::star::container::XHierarchicalNameAccess > xNameAccess, OUString
sPath);
+ com::sun::star::uno::Reference<
com::sun::star::container::XHierarchicalNameAccess > getConfigAccess();
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source
cui/source/options/optaboutconfig.cxx | 34 ++
cui/source/options/optaboutconfig.hxx |3 +++
2 files changed, 37 insertions(+)
New commits:
commit f41b3971e2ee6a371e1afaa327dd5b3d107e0518
Author: Efe Gürkan YALAMAN
Date: Mon Jul 22 16:22:49 2013 +0300
Configuration Access method implemented.
This method is used for getting access to configurations.
Change-Id: Ia4aa82a3f2df02e26f750133f7a7d2c85a75710c
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index e6ec794..09805c0 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -11,8 +11,15 @@
#include "optHeaderTabListbox.hxx"
#include
#include
+#include
+#include
+#include
+#include
+#include
+
using namespace svx;
+using namespace ::com::sun::star;
#define ITEMID_PREF 1
#define ITEMID_TYPE 2
@@ -71,4 +78,31 @@ void CuiAboutConfigTabPage::InsertEntry( OUString& rProp,
OUString& rStatus, OU
pPrefBox->Insert( pEntry );
}
+
+sal_Bool CuiAboutConfigTabPage::FillItems()
+{
+return sal_False;
+}
+
+uno::Reference< container::XNameAccess >
CuiAboutConfigTabPage::getConfigAccess()
+{
+uno::Reference< uno::XComponentContext > xContext(
::comphelper::getProcessComponentContext() );
+
+uno::Reference< lang::XMultiServiceFactory > xConfigProvider(
+com::sun::star::configuration::theDefaultProvider::get(
xContext ) );
+
+beans::NamedValue aProperty;
+aProperty.Name = "nodepath";
+aProperty.Value = uno::makeAny( OUString("org.openoffice") );
+
+uno::Sequence< uno::Any > aArgumentList( 1 );
+aArgumentList[0] = uno::makeAny( aProperty );
+
+uno::Reference< container::XNameAccess > xNameAccess(
+xConfigProvider->createInstanceWithArguments(
+"com.sun.star.configuration.ConfigurationAccess",
aArgumentList ),
+uno::UNO_QUERY_THROW );
+
+return xNameAccess;
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
index cdfb1d5..eb446dc 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -13,6 +13,7 @@
#include
#include
#include "optHeaderTabListbox.hxx"
+#include
namespace svx
{
@@ -34,6 +35,8 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rItemset );
void InsertEntry(OUString& rProp, OUString& rStatus, OUString& rType,
OUString& rValue);
+ sal_Bool FillItems();
+ com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >
getConfigAccess();
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source
cui/source/options/optaboutconfig.cxx | 16 +++-
cui/source/options/optaboutconfig.hxx |4 +++-
2 files changed, 18 insertions(+), 2 deletions(-)
New commits:
commit 5a3b21b5fb579bcf86eff172862b1c23c499b361
Author: Efe Gürkan YALAMAN
Date: Sun Jul 21 12:35:13 2013 +0300
starting to initial implementation
Change-Id: Ibe2e61b599bd47708cefaa03fdba03e6428c6ed6
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index a130753..864c681 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -9,6 +9,7 @@
#include "optaboutconfig.hxx"
#include "optHeaderTabListbox.hxx"
+#include
using namespace svx;
@@ -17,8 +18,17 @@ using namespace svx;
#define ITEMID_STATUS 3
#define ITEMID_VALUE4
+struct CuiAboutConfigTabPage_Impl
+{
+SvtAccessibilityOptions m_aAccConfig;
+CuiAccessibilityOptionsTabPage_Impl()
+: m_aAccConfig(){}
+//FIXME use this struct for all options possible.
+}
+
CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* pParent, const
SfxItemSet& rItemSet )
-:SfxTabPage( pParent, "AboutConfig", "cui/ui/aboutconfigdialog.ui",
rItemSet)
+:SfxTabPage( pParent, "AboutConfig", "cui/ui/aboutconfigdialog.ui",
rItemSet),
+m_pImpl(new CuiAboutConfigTabPage_Impl)
{
get(m_pDefaultBtn,"default");
get(m_pEditBtn, "edit");
@@ -57,4 +67,8 @@ SfxTabPage* CuiAboutConfigTabPage::Create( Window* pParent,
const SfxItemSet& rI
{
return ( new CuiAboutConfigTabPage( pParent, rItemSet) );
}
+
+sal_Bool CuiAboutConfigTabPage::FillItemSet()
+{
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
index 6848a8f..a924877 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -18,7 +18,7 @@ namespace svx
{
class OptHeaderTabListBox;
}
-class CuiAboutConfigTabPage;
+struct CuiAboutConfigTabPage_Impl;
class CuiAboutConfigTabPage : public SfxTabPage
{
@@ -28,6 +28,8 @@ private:
PushButton* m_pEditBtn;
::svx::OptHeaderTabListBox* pPrefBox;
+
+CuiAboutConfigTabPage_Impl* m_pImpl;
public:
CuiAboutConfigTabPage( Window* pParent, const SfxItemSet& rItemSet );
~CuiAboutConfigTabPage();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source
cui/source/options/optaboutconfig.cxx | 14 +-
cui/source/options/optaboutconfig.hxx |3 +--
2 files changed, 14 insertions(+), 3 deletions(-)
New commits:
commit 4597f78aba99176b8c4ef89c724c057a7f1b16b9
Author: Efe Gürkan YALAMAN
Date: Wed Jul 3 22:50:03 2013 +0300
Multi column listboxes initial headerbar added
Change-Id: Ie5f4019e2565ae24a53e820f933c226cb9517660
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 22aff88..6a46085 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -15,7 +15,8 @@ using namespace svx;
CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* pParent, const
SfxItemSet& rItemSet )
:SfxTabPage( pParent, "AboutConfig", "cui/ui/aboutconfigdialog.ui",
rItemSet)
{
-//get(m_pEditBtn, "");
+get(m_pDefaultBtn,"default");
+get(m_pEditBtn, "edit");
m_pPrefCtrl = get("preferences");
@@ -25,6 +26,17 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window*
pParent, const SfxItemSet&
WinBits nBits = WB_SCROLL | WB_SORT;
pPrefBox = new svx::OptHeaderTabListBox( *m_pPrefCtrl, nBits );
+//FIXME use define's for ItemID's, InsertItem(itemID, text, nsize, winbits)
+HeaderBar &rBar = pPrefBox->GetTheHeaderBar();
+rBar.InsertItem( 1, get("preference")->GetText(), 0, HIB_LEFT |
HIB_VCENTER );
+rBar.InsertItem( 2, get("status")->GetText(), 0, HIB_LEFT |
HIB_VCENTER );
+rBar.InsertItem( 3, get("type")->GetText(), 0, HIB_LEFT |
HIB_VCENTER );
+rBar.InsertItem( 4, get("value")->GetText(), 0, HIB_LEFT |
HIB_VCENTER );
+//FIXME this numbers are just for testing purposes implement this better
and more dynamic way.
+long aTabs[] = {12,12,12,12};
+
+pPrefBox->SetTabs(aTabs, MAP_PIXEL);
+
}
CuiAboutConfigTabPage::~CuiAboutConfigTabPage()
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
index e0d8815..6848a8f 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -24,8 +24,7 @@ class CuiAboutConfigTabPage : public SfxTabPage
{
private:
SvxSimpleTableContainer* m_pPrefCtrl;
-//In case of tab page we can think a revert button
-//PushButton* m_pDefaultBtn
+PushButton* m_pDefaultBtn;
PushButton* m_pEditBtn;
::svx::OptHeaderTabListBox* pPrefBox;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source
cui/source/options/optaboutconfig.cxx |8 +++-
cui/source/options/treeopt.src|1 +
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 49678807b3730c3971297932af9ca4a7a4ebdb79
Author: Efe Gürkan YALAMAN
Date: Thu Jun 27 17:02:01 2013 +0300
Empty tab page created and added on options dialog
Buttons cause crash on empty tab page.
Change-Id: I34bfb412c4d9dda9fdf71b6803be67939c00ff59
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 55870f9..22aff88 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -13,10 +13,16 @@
using namespace svx;
CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* pParent, const
SfxItemSet& rItemSet )
-:SfxTabPage( pParent, "AboutConfig", "cui/ui/optaboutconfigdialog.ui",
rItemSet)
+:SfxTabPage( pParent, "AboutConfig", "cui/ui/aboutconfigdialog.ui",
rItemSet)
{
//get(m_pEditBtn, "");
+m_pPrefCtrl = get("preferences");
+
+Size aControlSize(200,200);
+m_pPrefCtrl->set_width_request(aControlSize.Width());
+m_pPrefCtrl->set_height_request(aControlSize.Height());
+
WinBits nBits = WB_SCROLL | WB_SORT;
pPrefBox = new svx::OptHeaderTabListBox( *m_pPrefCtrl, nBits );
}
diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index af8e332..871c787 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -101,6 +101,7 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
< "Accessibility" ; RID_SVXPAGE_ACCESSIBILITYCONFIG ; > ;
< "Advanced" ; RID_SVXPAGE_OPTIONS_JAVA ; > ;
< "Online Update" ; RID_SVXPAGE_ONLINEUPDATE ; > ;
+< "About Config" ; RID_SVXPAGE_ABOUT_CONFIG ; > ;
};
};
StringArray SID_LANGUAGE_OPTIONS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source cui/uiconfig
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
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 000..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
+#include
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.
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source cui/uiconfig
cui/source/options/optaboutconfig.hxx | 23 ++-
cui/uiconfig/ui/aboutconfigdialog.ui |7 ++-
2 files changed, 24 insertions(+), 6 deletions(-)
New commits:
commit bb82e581d4cb100e804c32e60efa1af5b98ae741
Author: Efe Gürkan YALAMAN
Date: Thu Jun 20 16:44:25 2013 +0300
Improvements on current prototypes.
License statement added to header. modulename changed svx to cui.
Change-Id: I90f96e6c4720af392b344fce1052dd135e611bae
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
index 969f130a..68fb0c5 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -1,16 +1,24 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-#ifndef _SVX_OPTABOUTCONFIG_HXX
-#define _SVX_OPTABOUTCONFIG_HXX
+/*
+ * 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/.
+ */
+
+#ifndef INCLUDED_CUI_OPTABOUTCONFIG_HXX
+#define INCLUDED_CUI_OPTBABOUTCONFIG_HXX
#include
-namespace svx
+namespace cui
{
class OptHeaderTabListBox;
}
-class SvxAboutConfigTabPage : public SfxTabPage
+class CuiAboutConfigTabPage : public SfxTabPage
{
private:
SvxSimpleTableContainer* m_pPrefCtrl;
@@ -18,7 +26,12 @@ private:
//PushButton* m_pDefaultBtn
PushButton* m_pEditBtn;
-::svx::OptHeaderTabListBox* pPrefBox;
+::cui::OptHeaderTabListBox* pPrefBox;
public:
+ CuiAboutConfigTabPage( Window* pParent, const SfxItemSet& rItemSet );
+ ~CuiAboutConfigTabPage();
+
+ static SfxTabPage* create( Window* pParent, const SfxItemSet& rItemset );
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/uiconfig/ui/aboutconfigdialog.ui
b/cui/uiconfig/ui/aboutconfigdialog.ui
index e3af350..960200e 100644
--- a/cui/uiconfig/ui/aboutconfigdialog.ui
+++ b/cui/uiconfig/ui/aboutconfigdialog.ui
@@ -85,22 +85,27 @@
True
False
+True
0
none
True
False
+6
12
True
False
vertical
+6
True
False
+6
+6
True
@@ -185,7 +190,7 @@
True
False
-frame1
+Preferences
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source
cui/source/options/optaboutconfig.hxx | 24
1 file changed, 24 insertions(+)
New commits:
commit dc142bde4f9f2fbc0e37cf7911cc514e294904cc
Author: Efe Gürkan YALAMAN
Date: Wed Jun 19 21:07:55 2013 +0300
about config page header prototype
prototype is added for about:config utility as SfxTabPage.
Change-Id: I5146c0615a42f0ae084b3ec29b6b5f3b6677d9c6
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
new file mode 100644
index 000..969f130a
--- /dev/null
+++ b/cui/source/options/optaboutconfig.hxx
@@ -0,0 +1,24 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+#ifndef _SVX_OPTABOUTCONFIG_HXX
+#define _SVX_OPTABOUTCONFIG_HXX
+
+#include
+
+namespace svx
+{
+class OptHeaderTabListBox;
+}
+
+
+class SvxAboutConfigTabPage : public SfxTabPage
+{
+private:
+SvxSimpleTableContainer* m_pPrefCtrl;
+//In case of tab page we can think a revert button
+//PushButton* m_pDefaultBtn
+PushButton* m_pEditBtn;
+
+::svx::OptHeaderTabListBox* pPrefBox;
+public:
+}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
