[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-2/konversation/konversation
From:       Peter Simonsson <psn () linux ! se>
Date:       2005-03-31 20:21:22
Message-ID: 20050331202122.EA297696 () office ! kde ! org
[Download RAW message or body]

CVS commit by psn: 

Update the nick combo with the server identity instead of always filling it
with the default identity


  M +12 -0     channel.cpp   1.309
  M +2 -1      channel.h   1.110
  M +1 -1      chatwindow.h   1.62
  M +5 -5      server.cpp   1.455
  M +4 -0      servergroupsettings.cpp   1.5
  M +11 -0     statuspanel.cpp   1.78
  M +6 -4      statuspanel.h   1.30


--- kdeextragear-2/konversation/konversation/channel.cpp  #1.308:1.309
@@ -334,4 +334,5 @@ void Channel::setServer(Server *server) 
   topicLine->setServer(server);
   refreshModeButtons();
+  setIdentity(server->getIdentity());
 
   connect(server->getOutputFilter(),SIGNAL(cycleChannel()),this,SLOT(cycleChannel()));
@@ -2169,3 +2170,14 @@ QString NickList::completeNick(const QSt
 }
 
+void Channel::setIdentity(const Identity *newIdentity)
+{
+  if(!newIdentity) {
+    return;
+  }
+
+  ChatWindow::setIdentity(newIdentity);
+  nicknameCombobox->clear();
+  nicknameCombobox->insertStringList(newIdentity->getNicknameList());
+}
+
 #include "channel.moc"

--- kdeextragear-2/konversation/konversation/channel.h  #1.109:1.110
@@ -99,4 +99,5 @@ class Channel : public ChatWindow
 
     virtual void setServer(Server* newServer);
+    virtual void setIdentity(const Identity *newIdentity);
     
     /** get the channel topic history, including the current topic at the top,

--- kdeextragear-2/konversation/konversation/chatwindow.h  #1.61:1.62
@@ -99,5 +99,5 @@ class ChatWindow : public BASE_CLASS
      */
     Server* getServer();
-    void setIdentity(const Identity *newIdentity);
+    virtual void setIdentity(const Identity *newIdentity);
     void setTextView(IRCView* newView);
     IRCView* getTextView() const;

--- kdeextragear-2/konversation/konversation/server.cpp  #1.454:1.455
@@ -1856,7 +1856,7 @@ void Server::joinChannel(const QString &
 {
   // (re-)join channel, open a new panel if needed
-  Channel* channel=getChannelByName(name);
-  if(!channel)
-  {
+  Channel* channel = getChannelByName(name);
+
+  if(!channel) {
     channel=getMainWindow()->addChannel(this,name);
     Q_ASSERT(channel);
@@ -1873,6 +1873,5 @@ void Server::joinChannel(const QString &
   ChannelNickPtr channelNick = addNickToJoinedChannelsList(name, getNickname());
 
-  if ((channelNick->getHostmask() != hostmask ) && !hostmask.isEmpty())
-  {
+  if ((channelNick->getHostmask() != hostmask ) && !hostmask.isEmpty()) {
     NickInfoPtr nickInfo = channelNick->getNickInfo();
     nickInfo->setHostmask(hostmask);

--- kdeextragear-2/konversation/konversation/servergroupsettings.cpp  #1.4:1.5
@@ -19,4 +19,5 @@ int ServerGroupSettings::s_availableId =
 
 ServerGroupSettings::ServerGroupSettings()
+  : KShared()
 {
   m_id = s_availableId;
@@ -27,4 +28,5 @@ ServerGroupSettings::ServerGroupSettings
 
 ServerGroupSettings::ServerGroupSettings(int id)
+  : KShared()
 {
   if(id < 0) {
@@ -40,4 +42,5 @@ ServerGroupSettings::ServerGroupSettings
 
 ServerGroupSettings::ServerGroupSettings(const ServerGroupSettings& settings)
+  : KShared()
 {
   setName(settings.name());
@@ -52,4 +55,5 @@ ServerGroupSettings::ServerGroupSettings
 
 ServerGroupSettings::ServerGroupSettings(const QString& name)
+  : KShared()
 {
   setName(name);

--- kdeextragear-2/konversation/konversation/statuspanel.cpp  #1.77:1.78
@@ -316,3 +316,14 @@ void StatusPanel::setShowNicknameBox(boo
 }
 
+void StatusPanel::setIdentity(const Identity *newIdentity)
+{
+  if(!newIdentity) {
+    return;
+  }
+
+  ChatWindow::setIdentity(newIdentity);
+  nicknameCombobox->clear();
+  nicknameCombobox->insertStringList(newIdentity->getNicknameList());
+}
+
 #include "statuspanel.moc"

--- kdeextragear-2/konversation/konversation/statuspanel.h  #1.29:1.30
@@ -55,4 +55,6 @@ class StatusPanel : public ChatWindow
     virtual void emitUpdateInfo();
     
+    virtual void setIdentity(const Identity *newIdentity);
+
   signals:
     void newText(QWidget* widget,const QString& highlightColor,bool important);


[prev in list] [next in list] [prev in thread] [next in thread]