← Back to branch summary

~ubuntu-branches/ubuntu/trusty/kvirc/trusty

« back to all changes in this revision

Viewing changes to src/modules/filetransferwindow/libkvifiletransferwindow.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Kai Wasserbäch, Kai Wasserbäch, Raúl Sánchez Siles
  • Date: 2011-02-12 10:40:21 UTC
  • mfrom: (14.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20110212104021-5mh4f75jlku20mnt
The combined "Twisted Experiment" and "Nocturnal Raid" release.

[ Kai Wasserbäch ]
* Synced to upstream's SVN revision 5467.
* debian/rules:
  - Added .PHONY line.
  - Resurrect -DMANUAL_REVISION, got lost somewhere and we build SVN
    revisions again.
  - Replace "-DWITH_NO_EMBEDDED_CODE=YES" with "-DWANT_CRYPTOPP=YES".
  - Change the remaining -DWITH/-DWITHOUT to the new -DWANT syntax.
* debian/control:
  - Removed DMUA, I'm a DD now.
  - Changed my e-mail address.
  - Removed unneeded relationships (no upgrades over two releases are
    supported).
  - Fix Suggests for kvirc-dbg.
  - kvirc-data: Make the "Suggests: kvirc" a Recommends, doesn't make much
    sense to install the -data package without the program.
* debian/source/local-options: Added with "unapply-patches".
* debian/kvirc.lintian-overrides: Updated to work for 4.1.1.
* debian/patches/21_make_shared-mime-info_B-D_superfluous.patch: Updated.
* debian/kvirc-data.install: Added .notifyrc.

[ Raúl Sánchez Siles ]
* Stating the right version where kvirc-data break and replace should happen.
* Fixing link to license file.
* Added French and Portuguese man pages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/filetransferwindow/libkvifiletransferwindow.cpp
3
3
//   File : libkvifiletransferwindow.cpp
4
4
//   Creation date : Mon Apr 21 2003 23:14:12 CEST by Szymon Stefanek
5
5
//
6
 
//   Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net)
 
6
//   Copyright (C) 2003-2010 Szymon Stefanek (pragma at kvirc dot net)
7
7
//
8
8
//   This program is FREE software. You can redistribute it and/or
9
9
//   modify it under the terms of the GNU General Public License
21
21
//
22
22
//=============================================================================
23
23
 
24
 
#include "filetransferwindow.h"
 
24
#include "FileTransferWindow.h"
25
25
 
26
 
#include "kvi_module.h"
27
 
#include "kvi_app.h"
28
 
#include "kvi_frame.h"
29
 
#include "kvi_window.h"
30
 
#include "kvi_locale.h"
31
 
#include "kvi_iconmanager.h"
 
26
#include "KviModule.h"
 
27
#include "KviApplication.h"
 
28
#include "KviMainWindow.h"
 
29
#include "KviWindow.h"
 
30
#include "KviLocale.h"
 
31
#include "KviIconManager.h"
32
32
 
33
33
#include <QSplitter>
34
34
 
35
 
KviFileTransferWindow * g_pFileTransferWindow = 0;
 
35
FileTransferWindow * g_pFileTransferWindow = 0;
36
36
 
37
37
static KviModuleExtension * filetransferwindow_extension_alloc(KviModuleExtensionAllocStruct * s)
38
38
{
55
55
                        }
56
56
                }
57
57
 
58
 
                g_pFileTransferWindow = new KviFileTransferWindow(s->pDescriptor,g_pFrame);
59
 
                g_pFrame->addWindow(g_pFileTransferWindow,!bCreateMinimized);
 
58
                g_pFileTransferWindow = new FileTransferWindow(s->pDescriptor,g_pMainWindow);
 
59
                g_pMainWindow->addWindow(g_pFileTransferWindow,!bCreateMinimized);
60
60
                if(bCreateMinimized)g_pFileTransferWindow->minimize();
61
61
                return g_pFileTransferWindow;
62
62
        }
123
123
                __tr2qs("Manage File &Transfers"),
124
124
                filetransferwindow_extension_alloc);
125
125
 
126
 
        if(d)d->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FILETRANSFER)));
 
126
        if(d)d->setIcon(*(g_pIconManager->getSmallIcon(KviIconManager::FileTransfer)));
127
127
 
128
128
 
129
129
        KVSM_REGISTER_SIMPLE_COMMAND(m,"open",filetransferwindow_kvs_cmd_open);
133
133
 
134
134
static bool filetransferwindow_module_cleanup(KviModule *)
135
135
{
136
 
        if(g_pFileTransferWindow && g_pFrame)
137
 
                g_pFrame->closeWindow(g_pFileTransferWindow);
 
136
        if(g_pFileTransferWindow && g_pMainWindow)
 
137
                g_pMainWindow->closeWindow(g_pFileTransferWindow);
138
138
        g_pFileTransferWindow = 0;
139
139
        return true;
140
140
}