dbaccess/AllLangResTarget_dbu.mk | 1
dbaccess/UIConfig_dbaccess.mk | 1
dbaccess/inc/dbaccess_helpid.hrc | 1
dbaccess/source/ui/dlg/UserAdminDlg.cxx | 13 +--
dbaccess/source/ui/dlg/UserAdminDlg.hrc | 27 --------
dbaccess/source/ui/dlg/UserAdminDlg.src | 45 -------------
dbaccess/source/ui/inc/dbu_resource.hrc | 2
dbaccess/uiconfig/ui/useradmindialog.ui | 106 ++++++++++++++++++++++++++++++++
helpcontent2 | 2
9 files changed, 114 insertions(+), 84 deletions(-)
New commits:
commit 2bf00a57385f66595ca15115f66a46b410debcba
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jan 29 14:37:29 2014 +0000
convert user admin dialog to .ui
Change-Id: Iee1a8b5f1fac024fb5983063f032b344e5814fbc
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index 6caa0ce..8a34f8d 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\
dbaccess/source/ui/dlg/RelationDlg.src \
dbaccess/source/ui/dlg/sqlmessage.src \
dbaccess/source/ui/dlg/textconnectionsettings.src \
- dbaccess/source/ui/dlg/UserAdminDlg.src \
dbaccess/source/ui/dlg/UserAdmin.src \
dbaccess/source/ui/misc/dbumiscres.src \
dbaccess/source/ui/misc/WizardPages.src \
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 5d65dfe..76d0176 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -25,6 +25,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/sortdialog \
dbaccess/uiconfig/ui/tablesfilterdialog \
dbaccess/uiconfig/ui/tablesfilterpage \
+ dbaccess/uiconfig/ui/useradmindialog \
))
# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index 746d5e4..4804227 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -295,7 +295,6 @@
#define HID_APP_VIEW_PREVIEW_3
"DBACCESS_HID_APP_VIEW_PREVIEW_3"
#define HID_DSADMIN_TYPE_DIALOG
"DBACCESS_HID_DSADMIN_TYPE_DIALOG"
-#define HID_DSADMIN_USERADMIN
"DBACCESS_HID_DSADMIN_USERADMIN"
#define HID_DBWIZ_PREVIOUS
"DBACCESS_HID_DBWIZ_PREVIOUS"
#define HID_DBWIZ_NEXT
"DBACCESS_HID_DBWIZ_NEXT"
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index d14f480..e2b810f 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -25,7 +25,6 @@
#include "propertysetitem.hxx"
#include "UITools.hxx"
#include "UserAdmin.hxx"
-#include "UserAdminDlg.hrc"
#include "UserAdminDlg.hxx"
#include <comphelper/processfactory.hxx>
@@ -52,12 +51,11 @@ namespace dbaui
,const Reference<
XComponentContext >& _rxORB
,const ::com::sun::star::uno::Any&
_aDataSourceName
,const Reference< XConnection >&
_xConnection)
- :SfxTabDialog(_pParent, ModuleRes(DLG_DATABASE_USERADMIN), _pItems)
- ,m_pItemSet(_pItems)
- ,m_xConnection(_xConnection)
- ,m_bOwnConnection(!_xConnection.is())
+ : SfxTabDialog(_pParent, "UserAdminDialog",
"dbaccess/ui/useradmindialog.ui", _pItems)
+ , m_pItemSet(_pItems)
+ , m_xConnection(_xConnection)
+ , m_bOwnConnection(!_xConnection.is())
{
-
m_pImpl.reset(new
ODbDataSourceAdministrationHelper(_rxORB,_pParent,this));
m_pImpl->setDataSourceOrName(_aDataSourceName);
Reference< XPropertySet > xDatasource =
m_pImpl->getCurrentDataSource();
@@ -67,11 +65,10 @@ namespace dbaui
delete pExampleSet;
pExampleSet = new SfxItemSet(*GetInputSetImpl());
- AddTabPage(TAB_PAGE_USERADMIN,
OUString(ModuleRes(STR_PAGETITLE_USERADMIN)), OUserAdmin::Create,0, sal_False,
1);
+ AddTabPage("settings", OUserAdmin::Create, 0);
// remove the reset button - it's meaning is much too ambiguous in
this dialog
RemoveResetButton();
- FreeResource();
}
OUserAdminDlg::~OUserAdminDlg()
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.hrc
b/dbaccess/source/ui/dlg/UserAdminDlg.hrc
deleted file mode 100644
index 09bea09..0000000
--- a/dbaccess/source/ui/dlg/UserAdminDlg.hrc
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef DBAUI_USERADMINDLG_HRC
-#define DBAUI_USERADMINDLG_HRC
-
-#define STR_PAGETITLE_USERADMIN 1
-
-
-#endif // DBAUI_USERADMINDLG_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.src
b/dbaccess/source/ui/dlg/UserAdminDlg.src
deleted file mode 100644
index dc26bf8..0000000
--- a/dbaccess/source/ui/dlg/UserAdminDlg.src
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "dbaccess_helpid.hrc"
-#include "UserAdminDlg.hrc"
-#include "dbu_dlg.hrc"
-
-TabDialog DLG_DATABASE_USERADMIN
-{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- Hide = TRUE;
- HelpId = HID_DSADMIN_USERADMIN;
-
- TabControl 1
- {
- OutputSize = TRUE ;
- };
- String STR_PAGETITLE_USERADMIN
- {
- Text[ en-US ] = "User Settings";
- };
-
- Text [ en-US ] = "User administration" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc
b/dbaccess/source/ui/inc/dbu_resource.hrc
index 2742bc7..5beaf5b 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -90,7 +90,7 @@
// FREE
#define DLG_INDEXDESIGN RID_DIALOG_START + 19
// FREE
-#define DLG_DATABASE_USERADMIN RID_DIALOG_START + 21
+ // FREE
// FREE
#define DLG_PASSWORD RID_DIALOG_START + 23
#define DLG_COLLECTION_VIEW RID_DIALOG_START + 27
diff --git a/dbaccess/uiconfig/ui/useradmindialog.ui
b/dbaccess/uiconfig/ui/useradmindialog.ui
new file mode 100644
index 0000000..f3649ea
--- /dev/null
+++ b/dbaccess/uiconfig/ui/useradmindialog.ui
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Wed Jan 29 14:36:32 2014 -->
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="UserAdminDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">User administration</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkNotebook" id="tabcontrol">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="settings">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0.4699999988079071</property>
+ <property name="label" translatable="yes">User
Settings</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">help</action-widget>
+ </action-widgets>
+ </object>
+</interface>
commit 8cfebe9673c5c423250b64ccf3092b881e532e1a
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jan 29 14:44:06 2014 +0000
Updated core
Project: help c15300e89b17b72948964159d6343f00b41a26eb
diff --git a/helpcontent2 b/helpcontent2
index 4a999f7..c15300e 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 4a999f706bc00ca36f266918cef0be8bd07333fe
+Subproject commit c15300e89b17b72948964159d6343f00b41a26eb
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
