3511395d | 2015-03-04 22:39:05 | Slávek Banko |
Fix incorrectly renamed strings (cherry picked from commit 9d34e5cf6d90e425ab5b0e86884f3de7f682849a) |
||
M src/kvirc/ui/kvi_frame.cpp M src/kvirc/ui/kvi_mdimanager.cpp |
||
diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index 0128f29..fbc6249 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -117,10 +117,10 @@ m_pActiveContext = 0; m_pDockExtension = 0; - + m_pSplitter = new TQSplitter(Qt::Horizontal,this,"main_splitter"); // m_pSplitter->setFrameShape(TQFrame::NoFrame); - + setCentralWidget(m_pSplitter); setUsesBigPixmaps(KVI_OPTION_BOOL(KviOption_boolUseBigIcons)); @@ -215,7 +215,7 @@ while(m_pWinList->first()) closeWindow(m_pWinList->first()); delete m_pWinList; - + delete m_pAccel; g_pFrame = 0; } @@ -544,7 +544,7 @@ // KviWindow * top = g_pActiveWindow; // if(!top)top = wnd; // g_pWinPropertiesConfig->writeEntry("IsMaximized",top->isMaximized()); - + g_pWinPropertiesConfig->writeEntry("WinRect",wnd->externalGeometry()); wnd->saveProperties(g_pWinPropertiesConfig); @@ -591,7 +591,7 @@ pCandidate = m_pWinList->first(); if(pCandidate == wnd)pCandidate = 0; } - + if(pCandidate) childWindowActivated(pCandidate); // else { m_pActiveWindow = 0; m_pActiveContext = 0; }; @@ -637,19 +637,19 @@ { wnd->loadProperties(g_pWinPropertiesConfig); // load it anyway (will set defaults if windows don't remember properties) - + if(KVI_OPTION_BOOL(KviOption_boolWindowsRememberProperties)) { bool bDocked = g_pWinPropertiesConfig->readBoolEntry("IsDocked",true); //bool bMaximized = g_pWinPropertiesConfig->readBoolEntry("IsMaximized",false); bool bMaximized; - + if(KVI_OPTION_BOOL(KviOption_boolMdiManagerInSdiMode)) { bMaximized = true; //KVI_OPTION_BOOL(KviOption_boolMdiManagerInSdiMode) = false; } else bMaximized = false; - + TQRect rect = g_pWinPropertiesConfig->readRectEntry("WinRect",TQRect(10,10,500,380)); if(bDocked) @@ -687,7 +687,7 @@ goto docking_done; } } - + default_docking: { KviMdiChild * lpC = dockWindow(wnd,false); //cascade it @@ -880,10 +880,10 @@ m_pTaskBar->setActiveItem(wnd->taskBarItem()); //wnd->gainedActiveWindowStatus(); // <-- atm unused - + if(g_pActiveWindow->view()) g_pActiveWindow->view()->clearUnreaded(); - + emit activeWindowChanged(); if(bActiveContextChanged)emit activeContextChanged(); @@ -966,7 +966,7 @@ if(KVI_OPTION_BOOL(KviOption_boolConfirmCloseWhenThereAreConnections)) { // check for running connections - + bool bGotRunningConnection = false; for(KviWindow * w = m_pWinList->first();w;w = m_pWinList->next()) { @@ -979,14 +979,14 @@ } } } - + if(bGotRunningConnection) { TQString txt = "<p>"; txt += __tr2qs("There are active connections, are you sure you wish to "); txt += __tr2qs("quit KVIrc?"); txt += "</p>"; - + switch(TQMessageBox::warning(this,__tr2qs("Confirmation - KVIrc"),txt,__tr2qs("&Yes"),__tr2qs("&Always"),__tr2qs("&No"),2,2)) { case 0: @@ -1045,7 +1045,7 @@ m_pMdi->update(); for(KviWindow * wnd = m_pWinList->first();wnd;wnd = m_pWinList->next())wnd->applyOptions(); updateCaption(); - + m_pTaskBar->applyOptions(); } @@ -1144,7 +1144,7 @@ if(!o->inherits("KviTalPopupMenu"))return; const KviTalPopupMenu * p = (const KviTalPopupMenu *)o; int idext = p->itemParameter(id); - + KviCustomToolBarDescriptor * dd = KviCustomToolBarManager::instance()->findDescriptorByInternalId(idext); if(dd) { @@ -1175,7 +1175,7 @@ #endif //TQVariant v = w->property("KviProperty_FocusOwner"); //if(v.isValid())return false; // Do NOT change the focus widget! - + if(w->parent()) { TQVariant v = w->parent()->property("KviProperty_ChildFocusOwner"); @@ -1220,9 +1220,9 @@ g_pApp->getLocalKvircDirectory(szTemp,KviApp::Config,KVI_CONFIGFILE_TOOLBARS); TQFile f(szTemp); - + bool bNeedDefaults = false; - + if(f.open(IO_ReadOnly)) { #ifdef COMPILE_USE_QT4 @@ -1250,11 +1250,11 @@ { // nope.... need to move it a->removeDockWindow(m_pTaskBar,true,false); - + //int iMaxWidth = m_pTaskBar->maximumWidth(); leftDock()->moveDockWindow(m_pTaskBar); //m_pTaskBar->setMaximumWidth(iMaxWidth); - //m_pTaskBar->setOrientationQt::Vertical); + //m_pTaskBar->setOrientationVertical); } // ensure that it is not too wide if(m_pTaskBar->width() > 600) @@ -1336,7 +1336,7 @@ // the class changed... // make sure that the tree task bar is in the left or right dock // and the classic one is in the top or bottom on - + TQt::Dock dock; int index; bool nl; @@ -1399,14 +1399,14 @@ { if(e->spontaneous()) { - + if(!dockExtension()) { executeInternalCommand(KVI_INTERNALCOMMAND_DOCKWIDGET_SHOW); } - TQTimer::singleShot( 0, this, TQT_SLOT(hide()) ); + TQTimer::singleShot( 0, this, TQT_SLOT(hide()) ); } - + } } diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp index 039bf28..5aab311 100644 --- a/src/kvirc/ui/kvi_mdimanager.cpp +++ b/src/kvirc/ui/kvi_mdimanager.cpp @@ -99,7 +99,7 @@ setFocusPolicy(TQ_NoFocus); viewport()->setFocusPolicy(TQ_NoFocus); #endif - + connect(g_pApp,TQT_SIGNAL(reloadImages()),this,TQT_SLOT(reloadImages())); } @@ -210,11 +210,11 @@ pOldTop->captionLabel()->setActive(false); if(pOldTop->m_state != KviMdiChild::Maximized)pMaximizedChild=0; } - + m_pZ->setAutoDelete(true); m_pZ->append(lpC); - if(pMaximizedChild)lpC->maximize(); //do not animate the change + if(pMaximizedChild)lpC->maximize(); //do not animate the change lpC->raise(); if(pMaximizedChild)pMaximizedChild->restore(); } @@ -227,7 +227,7 @@ /* if(topLevelWidget()->isActiveWindow()) { - + } */ } @@ -337,7 +337,7 @@ // make sure that the child is focused lpC->setFocus(); } - + // fixme: we could hide all the other children now! } @@ -554,9 +554,9 @@ if(!m_pSdiCloseButton) { KviMenuBar * b = m_pFrm->mainMenuBar(); - + TQWidget * pButtonParent; - + #ifdef COMPILE_USE_QT4 ** Diff limit reached (max: 250 lines) ** |