[Libreoffice-commits] core.git: desktop/Library_deploymentgui.mk desktop/source desktop/uiconfig extras/source
Caolán McNamara
caolanm at redhat.com
Wed May 21 05:47:37 PDT 2014
desktop/Library_deploymentgui.mk | 1
desktop/source/deployment/gui/descedit.cxx | 74 ------------------
desktop/source/deployment/gui/descedit.hxx | 48 -----------
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 5 -
desktop/source/deployment/gui/dp_gui_updatedialog.hxx | 3
desktop/uiconfig/ui/updatedialog.ui | 23 +----
extras/source/glade/libreoffice-catalog.xml.in | 3
7 files changed, 10 insertions(+), 147 deletions(-)
New commits:
commit ca4a3819475da1eb6115d83b1e8e33ae4e011261
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 21 13:45:12 2014 +0100
lets drop the custom DescriptionEdit widget
Change-Id: Id08b364b828ccacd5c54276daf605ec4ff3fdb0a
diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk
index 2a13cc6..ec0a836 100644
--- a/desktop/Library_deploymentgui.mk
+++ b/desktop/Library_deploymentgui.mk
@@ -56,7 +56,6 @@ endif
$(eval $(call gb_Library_set_componentfile,deploymentgui,desktop/source/deployment/gui/deploymentgui))
$(eval $(call gb_Library_add_exception_objects,deploymentgui,\
- desktop/source/deployment/gui/descedit \
desktop/source/deployment/gui/dp_gui_autoscrolledit \
desktop/source/deployment/gui/dp_gui_dependencydialog \
desktop/source/deployment/gui/dp_gui_dialog2 \
diff --git a/desktop/source/deployment/gui/descedit.cxx b/desktop/source/deployment/gui/descedit.cxx
deleted file mode 100644
index a7fb8b4..0000000
--- a/desktop/source/deployment/gui/descedit.cxx
+++ /dev/null
@@ -1,74 +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 <vcl/builder.hxx>
-#include <vcl/scrbar.hxx>
-#include <vcl/txtattr.hxx>
-#include <vcl/xtextedt.hxx>
-
-#include "descedit.hxx"
-
-#include "dp_gui.hrc"
-
-using dp_gui::DescriptionEdit;
-
-// DescriptionEdit -------------------------------------------------------
-
-DescriptionEdit::DescriptionEdit( Window* pParent) :
-
- ExtMultiLineEdit( pParent),
-
- m_bIsVerticalScrollBarHidden( true )
-
-{
- Init();
-}
-
-
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDescriptionEdit(Window* pParent, VclBuilder::stringmap &)
-{
- return new DescriptionEdit(pParent);
-}
-
-
-void DescriptionEdit::Init()
-{
- Clear();
- // no tabstop
- SetStyle( ( GetStyle() & ~WB_TABSTOP ) | WB_NOTABSTOP );
- // read-only
- SetReadOnly();
- // no cursor
- EnableCursor( false );
-}
-
-
-
-void DescriptionEdit::Clear()
-{
- SetText( OUString() );
-
- m_bIsVerticalScrollBarHidden = true;
- ScrollBar* pVScrBar = GetVScrollBar();
- if ( pVScrBar )
- pVScrBar->Hide();
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/descedit.hxx b/desktop/source/deployment/gui/descedit.hxx
deleted file mode 100644
index da2ee7d..0000000
--- a/desktop/source/deployment/gui/descedit.hxx
+++ /dev/null
@@ -1,48 +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 INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DESCEDIT_HXX
-#define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DESCEDIT_HXX
-
-#include "svtools/svmedit2.hxx"
-
-/// @HTML
-
-namespace dp_gui
-{
-
- class DescriptionEdit : public ExtMultiLineEdit
- {
- private:
- bool m_bIsVerticalScrollBarHidden;
-
- void Init();
-
- public:
- DescriptionEdit( Window* pParent);
- virtual inline ~DescriptionEdit() {}
-
- void Clear();
- };
-
-} // namespace dp_gui
-
-#endif // INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DESCEDIT_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 89e00ab..02db3ff 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -907,7 +907,6 @@ void UpdateDialog::initDescription()
m_pPublisherLink->Hide();
m_pReleaseNotesLabel->Hide();
m_pReleaseNotesLink->Hide();
- m_pDescriptions->Hide();
Link aLink = LINK( this, UpdateDialog, hyperlink_clicked );
m_pPublisherLink->SetClickHdl( aLink );
@@ -924,8 +923,7 @@ void UpdateDialog::clearDescription()
m_pReleaseNotesLabel->Hide();
m_pReleaseNotesLink->Hide();
m_pReleaseNotesLink->SetURL( sEmpty );
- m_pDescriptions->Hide();
- m_pDescriptions->Clear();
+ m_pDescriptions->SetText("");
}
bool UpdateDialog::showDescription(uno::Reference< xml::dom::XNode > const & aUpdateInfo)
@@ -976,7 +974,6 @@ bool UpdateDialog::showDescription( const OUString& rDescription)
// nothing to show
return false;
- m_pDescriptions->Show();
m_pDescriptions->SetText( rDescription );
return true;
}
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
index e7740c1..18a4f9a 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx
@@ -37,7 +37,6 @@
#include <vcl/fixedhyper.hxx>
#include <vcl/throbber.hxx>
-#include "descedit.hxx"
#include "dp_gui_updatedata.hxx"
/// @HTML
@@ -181,7 +180,7 @@ private:
FixedHyperlink* m_pPublisherLink;
FixedText* m_pReleaseNotesLabel;
FixedHyperlink* m_pReleaseNotesLink;
- dp_gui::DescriptionEdit* m_pDescriptions;
+ VclMultiLineEdit* m_pDescriptions;
HelpButton* m_pHelp;
PushButton* m_pOk;
PushButton* m_pClose;
diff --git a/desktop/uiconfig/ui/updatedialog.ui b/desktop/uiconfig/ui/updatedialog.ui
index 9410aff..34e6b10 100644
--- a/desktop/uiconfig/ui/updatedialog.ui
+++ b/desktop/uiconfig/ui/updatedialog.ui
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
<interface>
- <!-- interface-requires LibreOffice 1.0 -->
<requires lib="gtk+" version="3.0"/>
<object class="GtkDialog" id="UpdateDialog">
<property name="can_focus">False</property>
@@ -278,24 +277,18 @@
</packing>
</child>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <object class="GtkTextView" id="DESCRIPTIONS:border">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="vscrollbar_policy">always</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="deploymentgui-DescriptionEdit" id="DESCRIPTIONS">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="editable">False</property>
- </object>
- </child>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="editable">False</property>
+ <property name="cursor_visible">False</property>
+ <property name="accepts_tab">False</property>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index cbfcc6a..fb120fa 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -326,9 +326,6 @@
<glade-widget-class title="LicenseView" name="deploymentgui-LicenseView"
generic-name="LicenseView" parent="GtkTextView"
icon-name="widget-gtk-textview"/>
- <glade-widget-class title="DescriptionEdit" name="deploymentgui-DescriptionEdit"
- generic-name="DescriptionEdit" parent="GtkTextView"
- icon-name="widget-gtk-textview"/>
<glade-widget-class title="SvtValueSet" name="svtlo-ValueSet"
generic-name="Set of Value Options" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
More information about the Libreoffice-commits
mailing list