diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/carotte_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/carotte_159.png
new file mode 100644
index 00000000..f0627ae4
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/carotte_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/chicken_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/chicken_159.png
new file mode 100644
index 00000000..99648eb0
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/chicken_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/fish_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/fish_159.png
new file mode 100644
index 00000000..f024b538
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/fish_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/frei_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/frei_159.png
new file mode 100644
index 00000000..a91223bc
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/frei_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/lamb_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/lamb_159.png
new file mode 100644
index 00000000..1aa58f4d
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/lamb_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/pork_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/pork_159.png
new file mode 100644
index 00000000..fa8e0dc3
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/pork_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/steak_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/steak_159.png
new file mode 100644
index 00000000..d5a0b3b3
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/steak_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/wild dish_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/wild dish_159.png
new file mode 100644
index 00000000..db496c28
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/DarkTheme/wild dish_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/carotte_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/carotte_159.png
new file mode 100644
index 00000000..65e38e19
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/carotte_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/chicken_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/chicken_159.png
new file mode 100644
index 00000000..a55fb55f
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/chicken_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/fish_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/fish_159.png
new file mode 100644
index 00000000..43efdae6
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/fish_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/frei_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/frei_159.png
new file mode 100644
index 00000000..958246cf
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/frei_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/lamb_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/lamb_159.png
new file mode 100644
index 00000000..74098f3d
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/lamb_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/pork_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/pork_159.png
new file mode 100644
index 00000000..1eb5c3cd
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/pork_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/steak_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/steak_159.png
new file mode 100644
index 00000000..134e5c77
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/steak_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/wild dish_159.png b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/wild dish_159.png
new file mode 100644
index 00000000..eaaea78b
Binary files /dev/null and b/CampusAppWP8/CampusAppWP8/Assets/Icons/LightTheme/wild dish_159.png differ
diff --git a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
index 635ca627..8ebdefec 100644
--- a/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
+++ b/CampusAppWP8/CampusAppWP8/CampusAppWP8.csproj
@@ -443,35 +443,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -486,6 +499,7 @@
+
@@ -493,10 +507,12 @@
+
+
diff --git a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
index 013edcb0..0f8cddd4 100644
--- a/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
+++ b/CampusAppWP8/CampusAppWP8/Pages/Mensa/MensaPage.xaml.cs
@@ -16,9 +16,9 @@ namespace CampusAppWP8.Pages.Mensa
using CampusAppWP8.Resources;
using CampusAppWP8.Utility;
using CampusAppWP8.Utility.Lui.MessageBoxes;
+ using CampusAppWPortalLib8.Model.Mensa;
using Microsoft.Phone.Controls;
using Microsoft.Phone.Shell;
- using CampusAppWPortalLib8.Model.Mensa;
///
/// Class for the MensaPage
@@ -231,10 +231,57 @@ namespace CampusAppWP8.Pages.Mensa
private void SetupMensaPivot()
{
this.MensaPivot.Title = AppResources.MensaApp_Title + " (" + this.feed.Title + ")";
+ this.CreatesMealIcons();
this.MensaPivot.ItemsSource = this.feed.Model.Menus;
this.MensaPivot.SelectedIndex = this.selectedIndex;
}
+ ///
+ /// Method create the IconsUrl for the meals
+ ///
+ private void CreatesMealIcons()
+ {
+ foreach (MenuModel menus in this.feed.Model.Menus)
+ {
+ foreach (MealModel meal in menus.Meals)
+ {
+ switch (meal.IconName)
+ {
+ case MealModel.MealIconNameCow:
+ meal.IconUrl = Icons.Cow;
+ break;
+ case MealModel.MealIconNameCowPig:
+ meal.IconUrl = Icons.CowPig;
+ break;
+ case MealModel.MealIconNameFish:
+ meal.IconUrl = Icons.Fish;
+ break;
+ case MealModel.MealIconNameFowl:
+ meal.IconUrl = Icons.Fowl;
+ break;
+ case MealModel.MealIconNameFree:
+ meal.IconUrl = Icons.Free;
+ break;
+ case MealModel.MealIconNameLamb:
+ meal.IconUrl = Icons.Lamb;
+ break;
+ case MealModel.MealIconNamePig:
+ meal.IconUrl = Icons.Pig;
+ break;
+ case MealModel.MealIconNameVegetarian:
+ meal.IconUrl = Icons.Vegetarian;
+ break;
+ case MealModel.MealIconNameWild:
+ meal.IconUrl = Icons.Wild;
+ break;
+ default:
+ meal.IconUrl = string.Empty;
+ break;
+ }
+ }
+ }
+ }
+
///
/// Method calculate which pivot has to be selected
///
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Icons.cs b/CampusAppWP8/CampusAppWP8/Resources/Icons.cs
index eea1a597..ede5416b 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Icons.cs
+++ b/CampusAppWP8/CampusAppWP8/Resources/Icons.cs
@@ -62,7 +62,7 @@ namespace CampusAppWP8.Resources
{
get
{
- return Themerize("info_159.png");
+ return Themerize("steak_159.png");
}
}
@@ -73,7 +73,7 @@ namespace CampusAppWP8.Resources
{
get
{
- return Themerize("info_159.png");
+ return Themerize("pork_159.png");
}
}
@@ -139,7 +139,7 @@ namespace CampusAppWP8.Resources
{
get
{
- return Themerize("info_159.png");
+ return Themerize("fish_159.png");
}
}
@@ -150,7 +150,7 @@ namespace CampusAppWP8.Resources
{
get
{
- return Themerize("info_159.png");
+ return Themerize("chicken_159.png");
}
}
@@ -161,7 +161,7 @@ namespace CampusAppWP8.Resources
{
get
{
- return Themerize("info_159.png");
+ return Themerize("frei_159.png");
}
}
@@ -205,7 +205,7 @@ namespace CampusAppWP8.Resources
{
get
{
- return Themerize("info_159.png");
+ return Themerize("lamb_159.png");
}
}
@@ -304,7 +304,7 @@ namespace CampusAppWP8.Resources
{
get
{
- return Themerize("info_159.png");
+ return Themerize("pork_159.png");
}
}
@@ -414,7 +414,7 @@ namespace CampusAppWP8.Resources
{
get
{
- return Themerize("info_159.png");
+ return Themerize("carotte_159.png");
}
}
@@ -436,7 +436,7 @@ namespace CampusAppWP8.Resources
{
get
{
- return Themerize("info_159.png");
+ return Themerize("wilddish_159.png");
}
}
diff --git a/CampusAppWP8/CampusAppWP8/Resources/Icons.resx b/CampusAppWP8/CampusAppWP8/Resources/Icons.resx
index 360bc657..509cad32 100644
--- a/CampusAppWP8/CampusAppWP8/Resources/Icons.resx
+++ b/CampusAppWP8/CampusAppWP8/Resources/Icons.resx
@@ -127,10 +127,10 @@
campus_159.png
- info_159.png
+ steak_159.png
- info_159.png
+ pork_159.png
current_position_159.png
@@ -148,13 +148,13 @@
favorite_159.png
- info_159.png
+ fish_159.png
- info_159.png
+ chicken_159.png
- info_159.png
+ frei_159.png
homework_159.png
@@ -166,7 +166,7 @@
lab_159.png
- info_159.png
+ lamb_159.png
lecture_159.png
@@ -193,7 +193,7 @@
phone_159.png
- info_159.png
+ pork_159.png
placeinfo_159.png
@@ -223,12 +223,12 @@
update_159.png
- info_159.png
+ carotte_159.png
webmail_159.png
- info_159.png
+ wild dish_159.png
\ No newline at end of file
diff --git a/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MealModel.cs b/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MealModel.cs
index bb76fcf7..51d6c551 100644
--- a/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MealModel.cs
+++ b/CampusAppWP8/CampusAppWPortalLib8/Model/Mensa/MealModel.cs
@@ -9,8 +9,8 @@ namespace CampusAppWPortalLib8.Model.Mensa
{
using System.Xml.Serialization;
using CampusAppWPortalLib8.Resources;
- using CampusAppWPortalLib8.Utility;
-
+ using CampusAppWPortalLib8.Utility;
+
///
/// Model for a meal
///
@@ -21,47 +21,47 @@ namespace CampusAppWPortalLib8.Model.Mensa
///
/// Constant for the vegetarian icon
///
- private const string MealIconNameVegetarian = "CARROTTE";
+ public const string MealIconNameVegetarian = "CARROTTE";
///
/// Constant for the free icon
///
- private const string MealIconNameFree = "FREI";
+ public const string MealIconNameFree = "FREI";
///
/// Constant for the pig icon
///
- private const string MealIconNamePig = "SCHWEIN";
+ public const string MealIconNamePig = "SCHWEIN";
///
/// Constant for the cow icon
///
- private const string MealIconNameCow = "RIND";
+ public const string MealIconNameCow = "RIND";
///
/// Constant for the fowl icon
///
- private const string MealIconNameFowl = "GEFL";
+ public const string MealIconNameFowl = "GEFL";
///
/// Constant for the cow-pig icon
///
- private const string MealIconNameCowPig = "RINDSCHWEIN";
+ public const string MealIconNameCowPig = "RINDSCHWEIN";
///
/// Constant for the fish icon
///
- private const string MealIconNameFish = "FISCH";
+ public const string MealIconNameFish = "FISCH";
///
/// Constant for the wild icon
///
- private const string MealIconNameWild = "WILD";
+ public const string MealIconNameWild = "WILD";
///
/// Constant for the lamb icon
///
- private const string MealIconNameLamb = "LAMM";
+ public const string MealIconNameLamb = "LAMM";
///
/// Variable for the id of the meal
@@ -140,6 +140,17 @@ namespace CampusAppWPortalLib8.Model.Mensa
}
}
+ ///
+ /// Gets or sets the icon url
+ ///
+ public string IconUrl { get; set; }
+
+ ///
+ /// Gets or sets the icon name
+ ///
+ [XmlAttribute("icon")]
+ public string IconName { get; set; }
+
#endregion
#region Methods
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/others/beach_chair.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/others/beach_chair_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/others/beach_chair.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/DarkTheme/others/beach_chair_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/attention.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/attention_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/attention.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/attention_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/happy.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/happy_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/happy.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/happy_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/question.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/question_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/question.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/question_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/sad.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/sad_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/sad.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/emotions/sad_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/add.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/add_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/add.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/add_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/btu_account.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/btu_account_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/btu_account.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/btu_account_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/call.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/call_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/call.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/call_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/campusplan.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/campusplan_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/campusplan.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/campusplan_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/delete.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/delete_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/delete.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/delete_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/down.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/down_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/down.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/down_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/edit.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/edit_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/edit.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/edit_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/hausaufgaben.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/hausaufgaben_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/hausaufgaben.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/hausaufgaben_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/info.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/info_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/info.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/info_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/infopoint.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/infopoint_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/infopoint.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/infopoint_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/lehrstuehle.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/lehrstuehle_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/lehrstuehle.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/lehrstuehle_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/links.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/links_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/links.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/links_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/mail.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/mail_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/mail.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/mail_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/notenspiegel.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/notenspiegel_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/notenspiegel.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/notenspiegel_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/openinghours.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/openinghours_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/openinghours.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/openinghours_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/personen.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/personen_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/personen.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/personen_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/reload.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/reload_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/reload.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/reload_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/save.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/save_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/save.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/save_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/search.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/search_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/search.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/search_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan_add.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan_add_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan_add.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/stundenplan_add_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/survey.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/survey_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/survey.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/survey_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine_add.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine_add_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine_add.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/termine_add_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/up.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/up_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/up.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/up_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vereine.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vereine_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vereine.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vereine_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vorlesungsverzeichnis.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vorlesungsverzeichnis_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vorlesungsverzeichnis.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/functions/vorlesungsverzeichnis_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/exams.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/exams_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/exams.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/exams_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/info.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/info_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/info.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/info_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lab.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lab_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lab.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lab_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lecture.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lecture_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lecture.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/lecture_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/practise.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/practise_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/practise.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/practise_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/seminar.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/seminar_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/seminar.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/listicons/seminar_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_contact.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_contact_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_contact.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_contact_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_small.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_small_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_small.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/add_small_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/delete.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/delete_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/delete.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/delete_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/edit.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/edit_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/edit.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/edit_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/prefs.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/prefs_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/prefs.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/prefs_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/save.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/save_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/save.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/save_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/search.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/search_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/search.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/optionbuttons/search_159.png
diff --git a/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/others/beach_chair.png b/CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/others/beach_chair_159.png
similarity index 100%
rename from CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/others/beach_chair.png
rename to CampusAppWP8/IconCreator/dstImages/wp8/159x159/LightTheme/others/beach_chair_159.png
diff --git a/CampusAppWP8/IconCreator/scripts/IconCreator.pyc b/CampusAppWP8/IconCreator/scripts/IconCreator.pyc
index 4517557c..0a2c3608 100644
Binary files a/CampusAppWP8/IconCreator/scripts/IconCreator.pyc and b/CampusAppWP8/IconCreator/scripts/IconCreator.pyc differ
diff --git a/CampusAppWP8/IconCreator/scripts/createspng.py b/CampusAppWP8/IconCreator/scripts/createspng.py
index 756f8668..92fa299f 100644
--- a/CampusAppWP8/IconCreator/scripts/createspng.py
+++ b/CampusAppWP8/IconCreator/scripts/createspng.py
@@ -5,40 +5,48 @@ os.chdir("srcImages/functions")
for files in os.listdir("."):
if files.endswith(".svg"):
fileName, fileExtension = os.path.splitext(files)
- IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/LightTheme/functions/"+fileName+".png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon")
- IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/DarkTheme/functions/"+fileName+".png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon")
+ IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/LightTheme/functions/"+fileName+"_159.png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon")
+ IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/DarkTheme/functions/"+fileName+"_159.png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon")
os.chdir("../../")
os.chdir("srcImages/emotions")
for files in os.listdir("."):
if files.endswith(".svg"):
fileName, fileExtension = os.path.splitext(files)
- IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/LightTheme/emotions/"+fileName+".png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Emotion Speechbubble")
- IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/DarkTheme/emotions/"+fileName+".png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Emotion Speechbubble")
+ IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/LightTheme/emotions/"+fileName+"_159.png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Emotion Speechbubble")
+ IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/DarkTheme/emotions/"+fileName+"_159.png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Emotion Speechbubble")
os.chdir("../../")
os.chdir("srcImages/listicons")
for files in os.listdir("."):
if files.endswith(".svg"):
fileName, fileExtension = os.path.splitext(files)
- IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/listicons/"+fileName+".png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon")
- IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/DarkTheme/listicons/"+fileName+".png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon")
+ IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/listicons/"+fileName+"_159.png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon")
+ IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/DarkTheme/listicons/"+fileName+"_159.png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon")
os.chdir("../../")
os.chdir("srcImages/optionbuttons")
for files in os.listdir("."):
if files.endswith(".svg"):
fileName, fileExtension = os.path.splitext(files)
- IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/optionbuttons/"+fileName+".png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon")
- IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/DarkTheme/optionbuttons/"+fileName+".png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon")
+ IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/optionbuttons/"+fileName+"_159.png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon")
+ IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/DarkTheme/optionbuttons/"+fileName+"_159.png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon")
os.chdir("../../")
os.chdir("srcImages/others")
for files in os.listdir("."):
if files.endswith(".svg"):
fileName, fileExtension = os.path.splitext(files)
- IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/others/"+fileName+".png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon")
- IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/DarkTheme/others/"+fileName+".png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon")
+ IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/others/"+fileName+"_159.png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon")
+ IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/DarkTheme/others/"+fileName+"_159.png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon")
+os.chdir("../../")
+
+os.chdir("srcImages/food")
+for files in os.listdir("."):
+ if files.endswith(".svg"):
+ fileName, fileExtension = os.path.splitext(files)
+ IconCreator.convertSVGToPNG2(files, "../../dstImages/wp8/159x159/LightTheme/food/"+fileName+"_159.png",159,159,256,256,"fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none" , "Icon")
+ IconCreator.convertSVGToPNG(files, "../../dstImages/wp8/159x159/DarkTheme/food/"+fileName+"_159.png",159,159,256,256,"fill:#FFFFFF;fill-opacity:1;fill-rule:evenodd;stroke:none", "Icon")
os.chdir("../../")