TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Fix incomplete size restoration in TDEMainWindow class

Browse Source 
This resolves Bug 1519
Clean up build warnings in KEditToolbar
pull/16/head
Timothy Pearson 11 years ago
parent b1c819c323
commit 2d2661a554
3 changed files with 92 additions and 75 deletions
Show Stats Download Patch File Download Diff File

131
tdeui/kedittoolbar.cpp
Unescape View File

@ -62,7 +62,7 @@ static void dump_xml(const TQDomDocument& doc)
typedef TQValueList<TQDomElement> ToolbarList; typedef TQValueList<TQDomElement> ToolbarList;
namespace namespace KEditToolbarInternal
{ {
class XmlData class XmlData
{ {
@ -150,7 +150,7 @@ public:
return e->provides(TOOLBARITEMMIMETYPE); return e->provides(TOOLBARITEMMIMETYPE);
} }
static bool decode( const TQMimeSource* e, ToolbarItem& item ) static bool decode( const TQMimeSource* e, KEditToolbarInternal::ToolbarItem& item )
{ {
if (!e) if (!e)
return false; return false;
@ -185,9 +185,9 @@ public:
protected: protected:
virtual TQDragObject *dragObject() virtual TQDragObject *dragObject()
{ {
ToolbarItem *item = dynamic_cast<ToolbarItem*>(selectedItem()); KEditToolbarInternal::ToolbarItem *item = dynamic_cast<KEditToolbarInternal::ToolbarItem*>(selectedItem());
if ( item ) { if ( item ) {
ToolbarItemDrag *obj = new ToolbarItemDrag(item, KEditToolbarInternal::ToolbarItemDrag *obj = new KEditToolbarInternal::ToolbarItemDrag(item,
this, "ToolbarAction drag item"); this, "ToolbarAction drag item");
const TQPixmap *pm = item->pixmap(0); const TQPixmap *pm = item->pixmap(0);
if( pm ) if( pm )
@ -199,7 +199,7 @@ protected:
virtual bool acceptDrag(TQDropEvent *event) const virtual bool acceptDrag(TQDropEvent *event) const
{ {
return ToolbarItemDrag::canDecode( event ); return KEditToolbarInternal::ToolbarItemDrag::canDecode( event );
} }
}; };
} // namespace } // namespace
@ -276,7 +276,7 @@ public:
/** /**
* Return the name of a given toolbar * Return the name of a given toolbar
*/ */
TQString toolbarName( const XmlData& xmlData, const TQDomElement& it ) const TQString toolbarName( const KEditToolbarInternal::XmlData& xmlData, const TQDomElement& it ) const
{ {
static const TQString &tagText = TDEGlobal::staticQString( "text" ); static const TQString &tagText = TDEGlobal::staticQString( "text" );
static const TQString &tagText2 = TDEGlobal::staticQString( "Text" ); static const TQString &tagText2 = TDEGlobal::staticQString( "Text" );
@ -293,8 +293,8 @@ public:
// the name of the toolbar might depend on whether or not // the name of the toolbar might depend on whether or not
// it is in tdeparts // it is in tdeparts
if ( ( xmlData.m_type == XmlData::Shell ) || if ( ( xmlData.m_type == KEditToolbarInternal::XmlData::Shell ) ||
( xmlData.m_type == XmlData::Part ) ) ( xmlData.m_type == KEditToolbarInternal::XmlData::Part ) )
{ {
TQString doc_name(xmlData.m_document.documentElement().attribute( attrName )); TQString doc_name(xmlData.m_document.documentElement().attribute( attrName ));
name += " <" + doc_name + ">"; name += " <" + doc_name + ">";
@ -304,7 +304,7 @@ public:
/** /**
* Look for a given item in the current toolbar * Look for a given item in the current toolbar
*/ */
TQDomElement findElementForToolbarItem( const ToolbarItem* item ) const TQDomElement findElementForToolbarItem( const KEditToolbarInternal::ToolbarItem* item ) const
{ {
static const TQString &attrName = TDEGlobal::staticQString( "name" ); static const TQString &attrName = TDEGlobal::staticQString( "name" );
for(TQDomNode n = m_currentToolbarElem.firstChild(); !n.isNull(); n = n.nextSibling()) for(TQDomNode n = m_currentToolbarElem.firstChild(); !n.isNull(); n = n.nextSibling())
@ -321,10 +321,10 @@ public:
void dump() void dump()
{ {
static const char* s_XmlTypeToString[] = { "Shell", "Part", "Local", "Merged" }; static const char* s_XmlTypeToString[] = { "Shell", "Part", "Local", "Merged" };
XmlDataList::Iterator xit = m_xmlFiles.begin(); KEditToolbarInternal::XmlDataList::Iterator xit = m_xmlFiles.begin();
for ( ; xit != m_xmlFiles.end(); ++xit ) for ( ; xit != m_xmlFiles.end(); ++xit )
{ {
kdDebug(240) << "XmlData type " << s_XmlTypeToString[(*xit).m_type] << " xmlFile: " << (*xit).m_xmlFile << endl; kdDebug(240) << "KEditToolbarInternal::XmlData type " << s_XmlTypeToString[(*xit).m_type] << " xmlFile: " << (*xit).m_xmlFile << endl;
for( TQValueList<TQDomElement>::Iterator it = (*xit).m_barList.begin(); for( TQValueList<TQDomElement>::Iterator it = (*xit).m_barList.begin();
it != (*xit).m_barList.end(); ++it ) { it != (*xit).m_barList.end(); ++it ) {
kdDebug(240) << " Toolbar: " << toolbarName( *xit, *it ) << endl; kdDebug(240) << " Toolbar: " << toolbarName( *xit, *it ) << endl;
@ -341,7 +341,7 @@ public:
TDEActionCollection* m_collection; TDEActionCollection* m_collection;
TDEInstance *m_instance; TDEInstance *m_instance;
XmlData* m_currentXmlData; KEditToolbarInternal::XmlData* m_currentXmlData;
TQDomElement m_currentToolbarElem; TQDomElement m_currentToolbarElem;
TQString m_xmlFile; TQString m_xmlFile;
@ -352,7 +352,7 @@ public:
ToolbarList m_barList; ToolbarList m_barList;
XmlDataList m_xmlFiles; KEditToolbarInternal::XmlDataList m_xmlFiles;
TQLabel *m_comboLabel; TQLabel *m_comboLabel;
KSeparator *m_comboSeparator; KSeparator *m_comboSeparator;
@ -609,9 +609,9 @@ void KEditToolbarWidget::initNonKPart(TDEActionCollection *collection,
TQDomElement elem; TQDomElement elem;
// first, get all of the necessary info for our local xml // first, get all of the necessary info for our local xml
XmlData local; KEditToolbarInternal::XmlData local;
local.m_xmlFile = d->xmlFile(file); local.m_xmlFile = d->xmlFile(file);
local.m_type = XmlData::Local; local.m_type = KEditToolbarInternal::XmlData::Local;
local.m_document.setContent(localXML); local.m_document.setContent(localXML);
elem = local.m_document.documentElement().toElement(); elem = local.m_document.documentElement().toElement();
local.m_barList = d->findToolbars(elem); local.m_barList = d->findToolbars(elem);
@ -619,9 +619,9 @@ void KEditToolbarWidget::initNonKPart(TDEActionCollection *collection,
d->m_xmlFiles.append(local); d->m_xmlFiles.append(local);
// then, the merged one (ui_standards + local xml) // then, the merged one (ui_standards + local xml)
XmlData merge; KEditToolbarInternal::XmlData merge;
merge.m_xmlFile = TQString::null; merge.m_xmlFile = TQString::null;
merge.m_type = XmlData::Merged; merge.m_type = KEditToolbarInternal::XmlData::Merged;
merge.m_document = domDocument(); merge.m_document = domDocument();
elem = merge.m_document.documentElement().toElement(); elem = merge.m_document.documentElement().toElement();
merge.m_barList = d->findToolbars(elem); merge.m_barList = d->findToolbars(elem);
@ -654,12 +654,12 @@ void KEditToolbarWidget::initKPart(KXMLGUIFactory* factory)
if (client->xmlFile().isNull()) if (client->xmlFile().isNull())
continue; continue;
XmlData data; KEditToolbarInternal::XmlData data;
data.m_xmlFile = client->localXMLFile(); data.m_xmlFile = client->localXMLFile();
if ( it.atFirst() ) if ( it.atFirst() )
data.m_type = XmlData::Shell; data.m_type = KEditToolbarInternal::XmlData::Shell;
else else
data.m_type = XmlData::Part; data.m_type = KEditToolbarInternal::XmlData::Part;
data.m_document.setContent( KXMLGUIFactory::readConfigFile( client->xmlFile(), client->instance() ) ); data.m_document.setContent( KXMLGUIFactory::readConfigFile( client->xmlFile(), client->instance() ) );
elem = data.m_document.documentElement().toElement(); elem = data.m_document.documentElement().toElement();
data.m_barList = d->findToolbars(elem); data.m_barList = d->findToolbars(elem);
@ -680,7 +680,7 @@ void KEditToolbarWidget::initKPart(KXMLGUIFactory* factory)
bool KEditToolbarWidget::save() bool KEditToolbarWidget::save()
{ {
//kdDebug(240) << "KEditToolbarWidget::save" << endl; //kdDebug(240) << "KEditToolbarWidget::save" << endl;
XmlDataList::Iterator it = d->m_xmlFiles.begin(); KEditToolbarInternal::XmlDataList::Iterator it = d->m_xmlFiles.begin();
for ( ; it != d->m_xmlFiles.end(); ++it) for ( ; it != d->m_xmlFiles.end(); ++it)
{ {
// let's not save non-modified files // let's not save non-modified files
@ -688,7 +688,7 @@ bool KEditToolbarWidget::save()
continue; continue;
// let's also skip (non-existent) merged files // let's also skip (non-existent) merged files
if ( (*it).m_type == XmlData::Merged ) if ( (*it).m_type == KEditToolbarInternal::XmlData::Merged )
continue; continue;
dump_xml((*it).m_document); dump_xml((*it).m_document);
@ -775,7 +775,7 @@ void KEditToolbarWidget::setupLayout()
// our list of inactive actions // our list of inactive actions
TQLabel *inactive_label = new TQLabel(i18n("A&vailable actions:"), this); TQLabel *inactive_label = new TQLabel(i18n("A&vailable actions:"), this);
m_inactiveList = new ToolbarListView(this); m_inactiveList = new KEditToolbarInternal::ToolbarListView(this);
m_inactiveList->setDragEnabled(true); m_inactiveList->setDragEnabled(true);
m_inactiveList->setAcceptDrops(true); m_inactiveList->setAcceptDrops(true);
m_inactiveList->setDropVisualizer(false); m_inactiveList->setDropVisualizer(false);
@ -793,7 +793,7 @@ void KEditToolbarWidget::setupLayout()
// our list of active actions // our list of active actions
TQLabel *active_label = new TQLabel(i18n("Curr&ent actions:"), this); TQLabel *active_label = new TQLabel(i18n("Curr&ent actions:"), this);
m_activeList = new ToolbarListView(this); m_activeList = new KEditToolbarInternal::ToolbarListView(this);
m_activeList->setDragEnabled(true); m_activeList->setDragEnabled(true);
m_activeList->setAcceptDrops(true); m_activeList->setAcceptDrops(true);
m_activeList->setDropVisualizer(true); m_activeList->setDropVisualizer(true);
@ -910,11 +910,11 @@ void KEditToolbarWidget::loadToolbarCombo(const TQString& defaultToolbar)
int defaultToolbarId = -1; int defaultToolbarId = -1;
int count = 0; int count = 0;
// load in all of the toolbar names into this combo box // load in all of the toolbar names into this combo box
XmlDataList::Iterator xit = d->m_xmlFiles.begin(); KEditToolbarInternal::XmlDataList::Iterator xit = d->m_xmlFiles.begin();
for ( ; xit != d->m_xmlFiles.end(); ++xit) for ( ; xit != d->m_xmlFiles.end(); ++xit)
{ {
// skip the local one in favor of the merged // skip the local one in favor of the merged
if ( (*xit).m_type == XmlData::Local ) if ( (*xit).m_type == KEditToolbarInternal::XmlData::Local )
continue; continue;
// each xml file may have any number of toolbars // each xml file may have any number of toolbars
@ -974,7 +974,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem)
if (it.isNull()) continue; if (it.isNull()) continue;
if (it.tagName() == tagSeparator) if (it.tagName() == tagSeparator)
{ {
ToolbarItem *act = new ToolbarItem(m_activeList, tagSeparator, sep_name.arg(sep_num++), TQString::null); KEditToolbarInternal::ToolbarItem *act = new KEditToolbarInternal::ToolbarItem(m_activeList, tagSeparator, sep_name.arg(sep_num++), TQString::null);
bool isLineSep = ( it.attribute(attrLineSeparator, "true").lower() == TQString::fromLatin1("true") ); bool isLineSep = ( it.attribute(attrLineSeparator, "true").lower() == TQString::fromLatin1("true") );
if(isLineSep) if(isLineSep)
act->setText(1, LINESEPARATORSTRING); act->setText(1, LINESEPARATORSTRING);
@ -988,7 +988,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem)
{ {
// Merge can be named or not - use the name if there is one // Merge can be named or not - use the name if there is one
TQString name = it.attribute( attrName ); TQString name = it.attribute( attrName );
ToolbarItem *act = new ToolbarItem(m_activeList, tagMerge, name, i18n("This element will be replaced with all the elements of an embedded component.")); KEditToolbarInternal::ToolbarItem *act = new KEditToolbarInternal::ToolbarItem(m_activeList, tagMerge, name, i18n("This element will be replaced with all the elements of an embedded component."));
if ( name.isEmpty() ) if ( name.isEmpty() )
act->setText(1, i18n("<Merge>")); act->setText(1, i18n("<Merge>"));
else else
@ -998,7 +998,7 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem)
if (it.tagName() == tagActionList) if (it.tagName() == tagActionList)
{ {
ToolbarItem *act = new ToolbarItem(m_activeList, tagActionList, it.attribute(attrName), i18n("This is a dynamic list of actions. You can move it, but if you remove it you won't be able to re-add it.") ); KEditToolbarInternal::ToolbarItem *act = new KEditToolbarInternal::ToolbarItem(m_activeList, tagActionList, it.attribute(attrName), i18n("This is a dynamic list of actions. You can move it, but if you remove it you won't be able to re-add it.") );
act->setText(1, i18n("ActionList: %1").arg(it.attribute(attrName))); act->setText(1, i18n("ActionList: %1").arg(it.attribute(attrName)));
continue; continue;
} }
@ -1014,13 +1014,16 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem)
if (it.attribute( attrName ) == action->name()) if (it.attribute( attrName ) == action->name())
{ {
// we have a match! // we have a match!
ToolbarItem *act = new ToolbarItem(m_activeList, it.tagName(), action->name(), action->toolTip()); KEditToolbarInternal::ToolbarItem *act = new KEditToolbarInternal::ToolbarItem(m_activeList, it.tagName(), action->name(), action->toolTip());
act->setText(1, action->plainText()); act->setText(1, action->plainText());
if (action->hasIcon()) if (action->hasIcon()) {
if (!action->icon().isEmpty()) if (!action->icon().isEmpty()) {
act->setPixmap(0, loader->loadIcon(action->icon(), TDEIcon::Toolbar, 16, TDEIcon::DefaultState, 0, true) ); act->setPixmap(0, loader->loadIcon(action->icon(), TDEIcon::Toolbar, 16, TDEIcon::DefaultState, 0, true) );
else // Has iconset }
else { // Has iconset
act->setPixmap(0, action->iconSet(TDEIcon::Toolbar).pixmap()); act->setPixmap(0, action->iconSet(TDEIcon::Toolbar).pixmap());
}
}
active_list.insert(action->name(), true); active_list.insert(action->name(), true);
break; break;
@ -1034,22 +1037,26 @@ void KEditToolbarWidget::loadActionList(TQDomElement& elem)
TDEAction *action = actionCollection->action( i ); TDEAction *action = actionCollection->action( i );
// skip our active ones // skip our active ones
if (active_list.contains(action->name())) if (active_list.contains(action->name())) {
continue; continue;
}
ToolbarItem *act = new ToolbarItem(m_inactiveList, tagActionList, action->name(), action->toolTip()); KEditToolbarInternal::ToolbarItem *act = new KEditToolbarInternal::ToolbarItem(m_inactiveList, tagActionList, action->name(), action->toolTip());
act->setText(1, action->plainText()); act->setText(1, action->plainText());
if (action->hasIcon()) if (action->hasIcon()) {
if (!action->icon().isEmpty()) if (!action->icon().isEmpty()) {
act->setPixmap(0, loader->loadIcon(action->icon(), TDEIcon::Toolbar, 16, TDEIcon::DefaultState, 0, true) ); act->setPixmap(0, loader->loadIcon(action->icon(), TDEIcon::Toolbar, 16, TDEIcon::DefaultState, 0, true) );
else // Has iconset }
else { // Has iconset
act->setPixmap(0, action->iconSet(TDEIcon::Toolbar).pixmap()); act->setPixmap(0, action->iconSet(TDEIcon::Toolbar).pixmap());
}
}
} }
// finally, add default separators to the inactive list // finally, add default separators to the inactive list
ToolbarItem *act = new ToolbarItem(m_inactiveList, tagSeparator, sep_name.arg(sep_num++), TQString::null); KEditToolbarInternal::ToolbarItem *act = new KEditToolbarInternal::ToolbarItem(m_inactiveList, tagSeparator, sep_name.arg(sep_num++), TQString::null);
act->setText(1, LINESEPARATORSTRING); act->setText(1, LINESEPARATORSTRING);
act = new ToolbarItem(m_inactiveList, tagSeparator, sep_name.arg(sep_num++), TQString::null); act = new KEditToolbarInternal::ToolbarItem(m_inactiveList, tagSeparator, sep_name.arg(sep_num++), TQString::null);
act->setText(1, SEPARATORSTRING); act->setText(1, SEPARATORSTRING);
} }
@ -1061,7 +1068,7 @@ TDEActionCollection *KEditToolbarWidget::actionCollection() const
void KEditToolbarWidget::slotToolbarSelected(const TQString& _text) void KEditToolbarWidget::slotToolbarSelected(const TQString& _text)
{ {
// iterate through everything // iterate through everything
XmlDataList::Iterator xit = d->m_xmlFiles.begin(); KEditToolbarInternal::XmlDataList::Iterator xit = d->m_xmlFiles.begin();
for ( ; xit != d->m_xmlFiles.end(); ++xit) for ( ; xit != d->m_xmlFiles.end(); ++xit)
{ {
// each xml file may have any number of toolbars // each xml file may have any number of toolbars
@ -1079,7 +1086,7 @@ void KEditToolbarWidget::slotToolbarSelected(const TQString& _text)
// load in our values // load in our values
loadActionList(d->m_currentToolbarElem); loadActionList(d->m_currentToolbarElem);
if ((*xit).m_type == XmlData::Part || (*xit).m_type == XmlData::Shell) if ((*xit).m_type == KEditToolbarInternal::XmlData::Part || (*xit).m_type == KEditToolbarInternal::XmlData::Shell)
setDOMDocument( (*xit).m_document ); setDOMDocument( (*xit).m_document );
return; return;
} }
@ -1089,7 +1096,7 @@ void KEditToolbarWidget::slotToolbarSelected(const TQString& _text)
void KEditToolbarWidget::slotInactiveSelected(TQListViewItem *item) void KEditToolbarWidget::slotInactiveSelected(TQListViewItem *item)
{ {
ToolbarItem* toolitem = static_cast<ToolbarItem *>(item); KEditToolbarInternal::ToolbarItem* toolitem = static_cast<KEditToolbarInternal::ToolbarItem *>(item);
if (item) if (item)
{ {
m_insertAction->setEnabled(true); m_insertAction->setEnabled(true);
@ -1105,7 +1112,7 @@ void KEditToolbarWidget::slotInactiveSelected(TQListViewItem *item)
void KEditToolbarWidget::slotActiveSelected(TQListViewItem *item) void KEditToolbarWidget::slotActiveSelected(TQListViewItem *item)
{ {
ToolbarItem* toolitem = static_cast<ToolbarItem *>(item); KEditToolbarInternal::ToolbarItem* toolitem = static_cast<KEditToolbarInternal::ToolbarItem *>(item);
m_removeAction->setEnabled( item ); m_removeAction->setEnabled( item );
static const TQString &tagAction = TDEGlobal::staticQString( "Action" ); static const TQString &tagAction = TDEGlobal::staticQString( "Action" );
@ -1137,8 +1144,8 @@ void KEditToolbarWidget::slotActiveSelected(TQListViewItem *item)
void KEditToolbarWidget::slotDropped(TDEListView *list, TQDropEvent *e, TQListViewItem *after) void KEditToolbarWidget::slotDropped(TDEListView *list, TQDropEvent *e, TQListViewItem *after)
{ {
ToolbarItem *item = new ToolbarItem(m_inactiveList); // needs parent, use inactiveList temporarily KEditToolbarInternal::ToolbarItem *item = new KEditToolbarInternal::ToolbarItem(m_inactiveList); // needs parent, use inactiveList temporarily
if(!ToolbarItemDrag::decode(e, *item)) { if(!KEditToolbarInternal::ToolbarItemDrag::decode(e, *item)) {
delete item; delete item;
return; return;
} }
@ -1165,7 +1172,7 @@ void KEditToolbarWidget::slotDropped(TDEListView *list, TQDropEvent *e, TQListVi
void KEditToolbarWidget::slotInsertButton() void KEditToolbarWidget::slotInsertButton()
{ {
ToolbarItem *item = (ToolbarItem*)m_inactiveList->currentItem(); KEditToolbarInternal::ToolbarItem *item = (KEditToolbarInternal::ToolbarItem*)m_inactiveList->currentItem();
insertActive(item, m_activeList->currentItem(), false); insertActive(item, m_activeList->currentItem(), false);
// we're modified, so let this change // we're modified, so let this change
@ -1178,7 +1185,7 @@ void KEditToolbarWidget::slotInsertButton()
void KEditToolbarWidget::slotRemoveButton() void KEditToolbarWidget::slotRemoveButton()
{ {
removeActive( dynamic_cast<ToolbarItem*>(m_activeList->currentItem()) ); removeActive( dynamic_cast<KEditToolbarInternal::ToolbarItem*>(m_activeList->currentItem()) );
// we're modified, so let this change // we're modified, so let this change
emit enableOk(true); emit enableOk(true);
@ -1186,7 +1193,7 @@ void KEditToolbarWidget::slotRemoveButton()
slotToolbarSelected( m_toolbarCombo->currentText() ); slotToolbarSelected( m_toolbarCombo->currentText() );
} }
void KEditToolbarWidget::insertActive(ToolbarItem *item, TQListViewItem *before, bool prepend) void KEditToolbarWidget::insertActive(KEditToolbarInternal::ToolbarItem *item, TQListViewItem *before, bool prepend)
{ {
if (!item) if (!item)
return; return;
@ -1212,7 +1219,7 @@ void KEditToolbarWidget::insertActive(ToolbarItem *item, TQListViewItem *before,
{ {
// we have the item in the active list which is before the new // we have the item in the active list which is before the new
// item.. so let's try our best to add our new item right after it // item.. so let's try our best to add our new item right after it
ToolbarItem *act_item = (ToolbarItem*)before; KEditToolbarInternal::ToolbarItem *act_item = (KEditToolbarInternal::ToolbarItem*)before;
TQDomElement elem = d->findElementForToolbarItem( act_item ); TQDomElement elem = d->findElementForToolbarItem( act_item );
Q_ASSERT( !elem.isNull() ); Q_ASSERT( !elem.isNull() );
d->m_currentToolbarElem.insertAfter(new_item, elem); d->m_currentToolbarElem.insertAfter(new_item, elem);
@ -1233,7 +1240,7 @@ void KEditToolbarWidget::insertActive(ToolbarItem *item, TQListViewItem *before,
updateLocal(d->m_currentToolbarElem); updateLocal(d->m_currentToolbarElem);
} }
void KEditToolbarWidget::removeActive(ToolbarItem *item) void KEditToolbarWidget::removeActive(KEditToolbarInternal::ToolbarItem *item)
{ {
if (!item) if (!item)
return; return;
@ -1260,7 +1267,7 @@ void KEditToolbarWidget::removeActive(ToolbarItem *item)
void KEditToolbarWidget::slotUpButton() void KEditToolbarWidget::slotUpButton()
{ {
ToolbarItem *item = (ToolbarItem*)m_activeList->currentItem(); KEditToolbarInternal::ToolbarItem *item = (KEditToolbarInternal::ToolbarItem*)m_activeList->currentItem();
// make sure we're not the top item already // make sure we're not the top item already
if (!item->itemAbove()) if (!item->itemAbove())
@ -1273,7 +1280,7 @@ void KEditToolbarWidget::slotUpButton()
delete item; delete item;
} }
void KEditToolbarWidget::moveActive( ToolbarItem* item, TQListViewItem* before ) void KEditToolbarWidget::moveActive( KEditToolbarInternal::ToolbarItem* item, TQListViewItem* before )
{ {
TQDomElement e = d->findElementForToolbarItem( item ); TQDomElement e = d->findElementForToolbarItem( item );
@ -1281,7 +1288,7 @@ void KEditToolbarWidget::moveActive( ToolbarItem* item, TQListViewItem* before )
return; return;
// cool, i found me. now clone myself // cool, i found me. now clone myself
ToolbarItem *clone = new ToolbarItem(m_activeList, KEditToolbarInternal::ToolbarItem *clone = new KEditToolbarInternal::ToolbarItem(m_activeList,
before, before,
item->internalTag(), item->internalTag(),
item->internalName(), item->internalName(),
@ -1303,7 +1310,7 @@ void KEditToolbarWidget::moveActive( ToolbarItem* item, TQListViewItem* before )
if ( !before ) if ( !before )
d->m_currentToolbarElem.insertBefore(e, d->m_currentToolbarElem.firstChild() ); d->m_currentToolbarElem.insertBefore(e, d->m_currentToolbarElem.firstChild() );
else else
d->m_currentToolbarElem.insertAfter(e, d->findElementForToolbarItem( (ToolbarItem*)before )); d->m_currentToolbarElem.insertAfter(e, d->findElementForToolbarItem( (KEditToolbarInternal::ToolbarItem*)before ));
// and set this container as a noMerge // and set this container as a noMerge
static const TQString &attrNoMerge = TDEGlobal::staticQString( "noMerge" ); static const TQString &attrNoMerge = TDEGlobal::staticQString( "noMerge" );
@ -1315,7 +1322,7 @@ void KEditToolbarWidget::moveActive( ToolbarItem* item, TQListViewItem* before )
void KEditToolbarWidget::slotDownButton() void KEditToolbarWidget::slotDownButton()
{ {
ToolbarItem *item = (ToolbarItem*)m_activeList->currentItem(); KEditToolbarInternal::ToolbarItem *item = (KEditToolbarInternal::ToolbarItem*)m_activeList->currentItem();
// make sure we're not the bottom item already // make sure we're not the bottom item already
if (!item->itemBelow()) if (!item->itemBelow())
@ -1332,14 +1339,14 @@ void KEditToolbarWidget::updateLocal(TQDomElement& elem)
{ {
static const TQString &attrName = TDEGlobal::staticQString( "name" ); static const TQString &attrName = TDEGlobal::staticQString( "name" );
XmlDataList::Iterator xit = d->m_xmlFiles.begin(); KEditToolbarInternal::XmlDataList::Iterator xit = d->m_xmlFiles.begin();
for ( ; xit != d->m_xmlFiles.end(); ++xit) for ( ; xit != d->m_xmlFiles.end(); ++xit)
{ {
if ( (*xit).m_type == XmlData::Merged ) if ( (*xit).m_type == KEditToolbarInternal::XmlData::Merged )
continue; continue;
if ( (*xit).m_type == XmlData::Shell || if ( (*xit).m_type == KEditToolbarInternal::XmlData::Shell ||
(*xit).m_type == XmlData::Part ) (*xit).m_type == KEditToolbarInternal::XmlData::Part )
{ {
if ( d->m_currentXmlData->m_xmlFile == (*xit).m_xmlFile ) if ( d->m_currentXmlData->m_xmlFile == (*xit).m_xmlFile )
{ {
@ -1423,11 +1430,11 @@ void KEditToolbarWidget::slotProcessExited( TDEProcess* )
return; return;
} }
ToolbarItem *item = (ToolbarItem*)m_activeList->currentItem(); KEditToolbarInternal::ToolbarItem *item = (KEditToolbarInternal::ToolbarItem*)m_activeList->currentItem();
if(item){ if(item){
item->setPixmap(0, BarIcon(icon, 16)); item->setPixmap(0, BarIcon(icon, 16));
Q_ASSERT( d->m_currentXmlData->m_type != XmlData::Merged ); Q_ASSERT( d->m_currentXmlData->m_type != KEditToolbarInternal::XmlData::Merged );
d->m_currentXmlData->m_isModified = true; d->m_currentXmlData->m_isModified = true;

12
tdeui/kedittoolbar.h
Unescape View File

@ -33,7 +33,7 @@ class TQListViewItem;
class KEditToolbarWidget; class KEditToolbarWidget;
class KEditToolbarPrivate; class KEditToolbarPrivate;
class KEditToolbarWidgetPrivate; class KEditToolbarWidgetPrivate;
namespace namespace KEditToolbarInternal
{ {
class ToolbarItem; class ToolbarItem;
class ToolbarListView; class ToolbarListView;
@ -411,9 +411,9 @@ private slots:
protected: // KDE4: make private protected: // KDE4: make private
void setupLayout(); void setupLayout();
void insertActive(ToolbarItem *item, TQListViewItem *before, bool prepend = false); void insertActive(KEditToolbarInternal::ToolbarItem *item, TQListViewItem *before, bool prepend = false);
void removeActive(ToolbarItem *item); void removeActive(KEditToolbarInternal::ToolbarItem *item);
void moveActive(ToolbarItem *item, TQListViewItem *before); void moveActive(KEditToolbarInternal::ToolbarItem *item, TQListViewItem *before);
void initNonKPart(TDEActionCollection *collection, const TQString& file, bool global); void initNonKPart(TDEActionCollection *collection, const TQString& file, bool global);
void initKPart(KXMLGUIFactory* factory); void initKPart(KXMLGUIFactory* factory);
void loadToolbarCombo(const TQString& defaultToolbar = TQString::null); void loadToolbarCombo(const TQString& defaultToolbar = TQString::null);
@ -421,8 +421,8 @@ protected: // KDE4: make private
void updateLocal(TQDomElement& elem); void updateLocal(TQDomElement& elem);
private: private:
ToolbarListView *m_inactiveList; KEditToolbarInternal::ToolbarListView *m_inactiveList;
ToolbarListView *m_activeList; KEditToolbarInternal::ToolbarListView *m_activeList;
TQComboBox *m_toolbarCombo; TQComboBox *m_toolbarCombo;
TQToolButton *m_upAction; TQToolButton *m_upAction;

24
tdeui/tdemainwindow.cpp
Unescape View File

@ -955,16 +955,26 @@ void TDEMainWindow::restoreWindowSize( TDEConfig * config )
} }
if ( !size.isEmpty() ) { if ( !size.isEmpty() ) {
#ifdef Q_WS_X11 #ifdef Q_WS_X11
int state = ( size.width() > desk.width() ? NET::MaxHoriz : 0 ) int state = 0;
| ( size.height() > desk.height() ? NET::MaxVert : 0 ); if (size.width() > desk.width()) {
if(( state & NET::Max ) == NET::Max ) state = state | NET::MaxHoriz;
; // no resize }
else if(( state & NET::MaxHoriz ) == NET::MaxHoriz ) if (size.height() > desk.height()) {
state = state | NET::MaxVert;
}
if (( state & NET::Max ) == NET::Max ) {
resize( desk.width(), desk.height());
}
else if(( state & NET::MaxHoriz ) == NET::MaxHoriz ) {
resize( width(), size.height()); resize( width(), size.height());
else if(( state & NET::MaxVert ) == NET::MaxVert ) }
else if(( state & NET::MaxVert ) == NET::MaxVert ) {
resize( size.width(), height()); resize( size.width(), height());
else }
else {
resize( size ); resize( size );
}
// TQWidget::showMaximized() is both insufficient and broken // TQWidget::showMaximized() is both insufficient and broken
KWin::setState( winId(), state ); KWin::setState( winId(), state );
#else #else

Write Preview
Loading…
Cancel
Save